xorg-xserver-server-proto.patch

   1 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/dbe/dbestruct.h xorg-server-1.6.5-proto/dbe/dbestruct.h
   2 --- xorg-server-1.6.5/dbe/dbestruct.h   2009-10-12 04:52:40.000000000 +0200
   3 +++ xorg-server-1.6.5-proto/dbe/dbestruct.h     2009-10-28 07:56:19.000000000 +0100
   4 @@ -37,10 +37,24 @@
   5  /* INCLUDES */
   6
   7  #define NEED_DBE_PROTOCOL
   8 -#include <X11/extensions/Xdbeproto.h>
   9 +#include <X11/extensions/dbeproto.h>
  10  #include "windowstr.h"
  11  #include "privates.h"
  12
  13 +typedef struct
  14 +{
  15 +    VisualID    visual;    /* one visual ID that supports double-buffering */
  16 +    int         depth;     /* depth of visual in bits                      */
  17 +    int         perflevel; /* performance level of visual                  */
  18 +}
  19 +XdbeVisualInfo;
  20 +
  21 +typedef struct
  22 +{
  23 +    int                 count;          /* number of items in visual_depth   */
  24 +    XdbeVisualInfo      *visinfo;       /* list of visuals & depths for scrn */
  25 +}
  26 +XdbeScreenVisualInfo;
  27
  28  /* DEFINES */
  29
  30 @@ -74,7 +88,7 @@
  31  /* Marker for free elements in the buffer ID array. */
  32  #define DBE_FREE_ID_ELEMENT    0
  33
  34 -extern void DbeExtensionInit (void);
  35 +extern _X_EXPORT void DbeExtensionInit (void);
  36
  37  /* TYPEDEFS */
  38
  39 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/dix/main.c xorg-server-1.6.5-proto/dix/main.c
  40 --- xorg-server-1.6.5/dix/main.c        2009-10-12 04:52:40.000000000 +0200
  41 +++ xorg-server-1.6.5-proto/dix/main.c  2010-04-29 13:05:11.035249244 +0200
  42 @@ -112,7 +112,7 @@
  43
  44  #ifdef DPMSExtension
  45  #define DPMS_SERVER
  46 -#include <X11/extensions/dpms.h>
  47 +#include <X11/extensions/dpmsproto.h>
  48  #include "dpmsproc.h"
  49  #endif
  50
  51 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/dmx/dmx.c xorg-server-1.6.5-proto/hw/dmx/dmx.c
  52 --- xorg-server-1.6.5/hw/dmx/dmx.c      2009-10-12 04:52:40.000000000 +0200
  53 +++ xorg-server-1.6.5-proto/hw/dmx/dmx.c        2010-04-29 13:30:20.526124234 +0200
  54 @@ -57,9 +57,7 @@
  55
  56  #include "dmxextension.h"
  57  #include <X11/extensions/dmxproto.h>
  58 -
  59 -#define _DMX_SERVER_
  60 -#include <X11/extensions/dmxext.h>
  61 +#include <X11/extensions/dmx.h>
  62
  63  #ifdef PANORAMIX
  64  #include "panoramiX.h"
  65 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/common/xf86DPMS.c xorg-server-1.6.5-proto/hw/xfree86/common/xf86DPMS.c
  66 --- xorg-server-1.6.5/hw/xfree86/common/xf86DPMS.c      2009-10-12 04:52:40.000000000 +0200
  67 +++ xorg-server-1.6.5-proto/hw/xfree86/common/xf86DPMS.c        2010-04-29 13:24:47.948125520 +0200
  68 @@ -41,7 +41,7 @@
  69  #include "xf86Priv.h"
  70  #ifdef DPMSExtension
  71  #define DPMS_SERVER
  72 -#include <X11/extensions/dpms.h>
  73 +#include <X11/extensions/dpmsproto.h>
  74  #include "dpmsproc.h"
  75  #endif
  76
  77 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/common/xf86Events.c xorg-server-1.6.5-proto/hw/xfree86/common/xf86Events.c
  78 --- xorg-server-1.6.5/hw/xfree86/common/xf86Events.c    2009-10-12 04:52:40.000000000 +0200
  79 +++ xorg-server-1.6.5-proto/hw/xfree86/common/xf86Events.c      2010-04-29 13:24:59.619187568 +0200
  80 @@ -83,7 +83,7 @@
  81
  82  #ifdef DPMSExtension
  83  #define DPMS_SERVER
  84 -#include <X11/extensions/dpms.h>
  85 +#include <X11/extensions/dpmsproto.h>
  86  #include "dpmsproc.h"
  87  #endif
  88
  89 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/common/xf86Init.c xorg-server-1.6.5-proto/hw/xfree86/common/xf86Init.c
  90 --- xorg-server-1.6.5/hw/xfree86/common/xf86Init.c      2009-10-12 04:52:40.000000000 +0200
  91 +++ xorg-server-1.6.5-proto/hw/xfree86/common/xf86Init.c        2010-04-29 13:24:35.177125305 +0200
  92 @@ -84,7 +84,7 @@
  93
  94  #ifdef DPMSExtension
  95  #define DPMS_SERVER
  96 -#include <X11/extensions/dpms.h>
  97 +#include <X11/extensions/dpmsproto.h>
  98  #include "dpmsproc.h"
  99  #endif
 100
 101 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/common/xf86Xinput.c xorg-server-1.6.5-proto/hw/xfree86/common/xf86Xinput.c
 102 --- xorg-server-1.6.5/hw/xfree86/common/xf86Xinput.c    2009-10-12 04:52:40.000000000 +0200
 103 +++ xorg-server-1.6.5-proto/hw/xfree86/common/xf86Xinput.c      2010-04-29 13:25:16.173126314 +0200
 104 @@ -66,7 +66,7 @@
 105
 106  #ifdef DPMSExtension
 107  #define DPMS_SERVER
 108 -#include <X11/extensions/dpms.h>
 109 +#include <X11/extensions/dpmsproto.h>
 110  #include "dpmsproc.h"
 111  #endif
 112
 113 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/dixmods/extmod/modinit.h xorg-server-1.6.5-proto/hw/xfree86/dixmods/extmod/modinit.h
 114 --- xorg-server-1.6.5/hw/xfree86/dixmods/extmod/modinit.h       2009-10-12 04:52:40.000000000 +0200
 115 +++ xorg-server-1.6.5-proto/hw/xfree86/dixmods/extmod/modinit.h 2010-04-29 13:19:42.097124843 +0200
 116 @@ -8,7 +8,7 @@
 117  #endif
 118
 119  #define _SHAPE_SERVER_  /* don't want Xlib structures */
 120 -#include <X11/extensions/shapestr.h>
 121 +#include <X11/extensions/shapeproto.h>
 122
 123  #ifdef MULTIBUFFER
 124  extern void MultibufferExtensionInit(INITARGS);
 125 @@ -19,8 +19,7 @@
 126  #ifdef XTEST
 127  extern void XTestExtensionInit(INITARGS);
 128  #define _XTEST_SERVER_
 129 -#include <X11/extensions/XTest.h>
 130 -#include <X11/extensions/xteststr.h>
 131 +#include <X11/extensions/xtestproto.h>
 132  #endif
 133
 134  #if 1
 135 @@ -35,19 +34,19 @@
 136  #ifdef XF86VIDMODE
 137  extern void    XFree86VidModeExtensionInit(INITARGS);
 138  #define _XF86VIDMODE_SERVER_
 139 -#include <X11/extensions/xf86vmstr.h>
 140 +#include <X11/extensions/xf86vmproto.h>
 141  #endif
 142
 143  #ifdef XFreeXDGA
 144  extern void XFree86DGAExtensionInit(INITARGS);
 145  extern void XFree86DGARegister(INITARGS);
 146  #define _XF86DGA_SERVER_
 147 -#include <X11/extensions/xf86dgastr.h>
 148 +#include <X11/extensions/xf86dgaproto.h>
 149  #endif
 150
 151  #ifdef DPMSExtension
 152  extern void DPMSExtensionInit(INITARGS);
 153 -#include <X11/extensions/dpmsstr.h>
 154 +#include <X11/extensions/dpmsproto.h>
 155  #endif
 156
 157  #ifdef XV
 158 @@ -65,7 +64,7 @@
 159
 160  #ifdef SHM
 161  extern void ShmExtensionInit(INITARGS);
 162 -#include <X11/extensions/shmstr.h>
 163 +#include <X11/extensions/shmproto.h>
 164  extern void ShmRegisterFuncs(
 165      ScreenPtr pScreen,
 166      ShmFuncsPtr funcs);
 167 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/fbdevhw/fbdevhw.c xorg-server-1.6.5-proto/hw/xfree86/fbdevhw/fbdevhw.c
 168 --- xorg-server-1.6.5/hw/xfree86/fbdevhw/fbdevhw.c      2009-10-12 04:52:40.000000000 +0200
 169 +++ xorg-server-1.6.5-proto/hw/xfree86/fbdevhw/fbdevhw.c        2010-04-29 13:25:54.276187263 +0200
 170 @@ -26,7 +26,7 @@
 171
 172  #include "globals.h"
 173  #define DPMS_SERVER
 174 -#include <X11/extensions/dpms.h>
 175 +#include <X11/extensions/dpmsproto.h>
 176
 177  #define DEBUG 0
 178
 179 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/modes/xf86Crtc.c xorg-server-1.6.5-proto/hw/xfree86/modes/xf86Crtc.c
 180 --- xorg-server-1.6.5/hw/xfree86/modes/xf86Crtc.c       2010-04-29 13:31:10.443248830 +0200
 181 +++ xorg-server-1.6.5-proto/hw/xfree86/modes/xf86Crtc.c 2010-04-29 13:28:12.105124367 +0200
 182 @@ -41,7 +41,7 @@
 183  #include "xf86RandR12.h"
 184  #include "X11/extensions/render.h"
 185  #define DPMS_SERVER
 186 -#include "X11/extensions/dpms.h"
 187 +#include "X11/extensions/dpmsproto.h"
 188  #include "X11/Xatom.h"
 189  #ifdef RENDER
 190  #include "picturestr.h"
 191 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/modes/xf86Cursors.c xorg-server-1.6.5-proto/hw/xfree86/modes/xf86Cursors.c
 192 --- xorg-server-1.6.5/hw/xfree86/modes/xf86Cursors.c    2009-10-12 04:52:40.000000000 +0200
 193 +++ xorg-server-1.6.5-proto/hw/xfree86/modes/xf86Cursors.c      2010-04-29 13:28:24.450312165 +0200
 194 @@ -40,7 +40,7 @@
 195  #include "xf86CursorPriv.h"
 196  #include "X11/extensions/render.h"
 197  #define DPMS_SERVER
 198 -#include "X11/extensions/dpms.h"
 199 +#include "X11/extensions/dpmsproto.h"
 200  #include "X11/Xatom.h"
 201  #ifdef RENDER
 202  #include "picturestr.h"
 203 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/modes/xf86Rotate.c xorg-server-1.6.5-proto/hw/xfree86/modes/xf86Rotate.c
 204 --- xorg-server-1.6.5/hw/xfree86/modes/xf86Rotate.c     2009-10-12 04:52:40.000000000 +0200
 205 +++ xorg-server-1.6.5-proto/hw/xfree86/modes/xf86Rotate.c       2010-04-29 13:28:37.195124675 +0200
 206 @@ -41,7 +41,7 @@
 207  #include "xf86RandR12.h"
 208  #include "X11/extensions/render.h"
 209  #define DPMS_SERVER
 210 -#include "X11/extensions/dpms.h"
 211 +#include "X11/extensions/dpmsproto.h"
 212  #include "X11/Xatom.h"
 213
 214  /* borrowed from composite extension, move to Render and publish? */
 215 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/vbe/vbe.c xorg-server-1.6.5-proto/hw/xfree86/vbe/vbe.c
 216 --- xorg-server-1.6.5/hw/xfree86/vbe/vbe.c      2009-10-12 04:52:40.000000000 +0200
 217 +++ xorg-server-1.6.5-proto/hw/xfree86/vbe/vbe.c        2010-04-29 13:26:17.954124692 +0200
 218 @@ -19,7 +19,7 @@
 219  #include "vbe.h"
 220  #include <X11/Xarch.h>
 221  #define DPMS_SERVER
 222 -#include <X11/extensions/dpms.h>
 223 +#include <X11/extensions/dpmsproto.h>
 224
 225  #define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x)
 226
 227 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/hw/xfree86/vgahw/vgaHW.h xorg-server-1.6.5-proto/hw/xfree86/vgahw/vgaHW.h
 228 --- xorg-server-1.6.5/hw/xfree86/vgahw/vgaHW.h  2009-10-12 04:52:40.000000000 +0200
 229 +++ xorg-server-1.6.5-proto/hw/xfree86/vgahw/vgaHW.h    2010-04-29 13:26:41.556124456 +0200
 230 @@ -26,7 +26,7 @@
 231
 232  #include "globals.h"
 233  #define DPMS_SERVER
 234 -#include <X11/extensions/dpms.h>
 235 +#include <X11/extensions/dpmsproto.h>
 236
 237  extern int vgaHWGetIndex(void);
 238
 239 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/mi/mieq.c xorg-server-1.6.5-proto/mi/mieq.c
 240 --- xorg-server-1.6.5/mi/mieq.c 2009-10-12 04:52:40.000000000 +0200
 241 +++ xorg-server-1.6.5-proto/mi/mieq.c   2010-04-29 13:10:14.108322448 +0200
 242 @@ -56,7 +56,7 @@
 243  #ifdef DPMSExtension
 244  # include "dpmsproc.h"
 245  # define DPMS_SERVER
 246 -# include <X11/extensions/dpms.h>
 247 +# include <X11/extensions/dpmsproto.h>
 248  #endif
 249
 250  #define QUEUE_SIZE  512
 251 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/mi/miinitext.c xorg-server-1.6.5-proto/mi/miinitext.c
 252 --- xorg-server-1.6.5/mi/miinitext.c    2009-10-12 04:52:40.000000000 +0200
 253 +++ xorg-server-1.6.5-proto/mi/miinitext.c      2010-04-29 13:27:43.849124639 +0200
 254 @@ -161,7 +161,7 @@
 255
 256  #ifdef MITSHM
 257  #define _XSHM_SERVER_
 258 -#include <X11/extensions/shmstr.h>
 259 +#include <X11/extensions/shmproto.h>
 260  #endif
 261  #ifdef XTEST
 262  #define _XTEST_SERVER_
 263 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/mi/miscrinit.c xorg-server-1.6.5-proto/mi/miscrinit.c
 264 --- xorg-server-1.6.5/mi/miscrinit.c    2009-10-12 04:52:40.000000000 +0200
 265 +++ xorg-server-1.6.5-proto/mi/miscrinit.c      2010-04-29 13:10:57.583125029 +0200
 266 @@ -40,7 +40,8 @@
 267  #include "miline.h"
 268  #ifdef MITSHM
 269  #define _XSHM_SERVER_
 270 -#include <X11/extensions/XShm.h>
 271 +#include <X11/extensions/shm.h>
 272 +#include "shmint.h"
 273  #endif
 274
 275  /* We use this structure to propogate some information from miScreenInit to
 276 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/os/WaitFor.c xorg-server-1.6.5-proto/os/WaitFor.c
 277 --- xorg-server-1.6.5/os/WaitFor.c      2009-10-12 04:52:40.000000000 +0200
 278 +++ xorg-server-1.6.5-proto/os/WaitFor.c        2010-04-29 13:21:03.913124860 +0200
 279 @@ -110,7 +110,7 @@
 280
 281  #ifdef DPMSExtension
 282  #define DPMS_SERVER
 283 -#include <X11/extensions/dpms.h>
 284 +#include <X11/extensions/dpmsproto.h>
 285  #endif
 286
 287  struct _OsTimerRec {
 288 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/bigreq.c xorg-server-1.6.5-proto/Xext/bigreq.c
 289 --- xorg-server-1.6.5/Xext/bigreq.c     2009-10-12 04:52:40.000000000 +0200
 290 +++ xorg-server-1.6.5-proto/Xext/bigreq.c       2010-04-29 13:11:48.023124141 +0200
 291 @@ -37,7 +37,7 @@
 292  #include "os.h"
 293  #include "dixstruct.h"
 294  #include "extnsionst.h"
 295 -#include <X11/extensions/bigreqstr.h>
 296 +#include <X11/extensions/bigreqsproto.h>
 297  #include "opaque.h"
 298  #include "modinit.h"
 299
 300 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/dpms.c xorg-server-1.6.5-proto/Xext/dpms.c
 301 --- xorg-server-1.6.5/Xext/dpms.c       2009-10-12 04:52:40.000000000 +0200
 302 +++ xorg-server-1.6.5-proto/Xext/dpms.c 2010-04-29 13:20:30.279124649 +0200
 303 @@ -45,8 +45,7 @@
 304  #include "extnsionst.h"
 305  #include "opaque.h"
 306  #define DPMS_SERVER
 307 -#include <X11/extensions/dpms.h>
 308 -#include <X11/extensions/dpmsstr.h>
 309 +#include <X11/extensions/dpmsproto.h>
 310  #include "dpmsproc.h"
 311  #include "modinit.h"
 312
 313 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/panoramiX.h xorg-server-1.6.5-proto/Xext/panoramiX.h
 314 --- xorg-server-1.6.5/Xext/panoramiX.h  2009-10-12 04:52:40.000000000 +0200
 315 +++ xorg-server-1.6.5-proto/Xext/panoramiX.h    2010-04-29 13:04:25.291124119 +0200
 316 @@ -41,7 +41,7 @@
 317  #define _PANORAMIX_H_
 318
 319  #define _PANORAMIX_SERVER
 320 -#include <X11/extensions/panoramiXext.h>
 321 +#include <X11/extensions/panoramiXproto.h>
 322  #undef _PANORAMIX_SERVER
 323
 324  #include "gcstruct.h"
 325 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/saver.c xorg-server-1.6.5-proto/Xext/saver.c
 326 --- xorg-server-1.6.5/Xext/saver.c      2009-10-12 04:52:40.000000000 +0200
 327 +++ xorg-server-1.6.5-proto/Xext/saver.c        2010-04-29 13:20:18.457186677 +0200
 328 @@ -55,7 +55,7 @@
 329  #endif
 330  #ifdef DPMSExtension
 331  #define DPMS_SERVER
 332 -#include <X11/extensions/dpms.h>
 333 +#include <X11/extensions/dpmsproto.h>
 334  #endif
 335
 336  #include <stdio.h>
 337 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/shape.c xorg-server-1.6.5-proto/Xext/shape.c
 338 --- xorg-server-1.6.5/Xext/shape.c      2009-10-12 04:52:40.000000000 +0200
 339 +++ xorg-server-1.6.5-proto/Xext/shape.c        2010-04-29 13:16:24.906161539 +0200
 340 @@ -44,7 +44,7 @@
 341  #include "resource.h"
 342  #include "opaque.h"
 343  #define _SHAPE_SERVER_ /* don't want Xlib structures */
 344 -#include <X11/extensions/shapestr.h>
 345 +#include <X11/extensions/shapeproto.h>
 346  #include "regionstr.h"
 347  #include "gcstruct.h"
 348  #include "modinit.h"
 349 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/shm.c xorg-server-1.6.5-proto/Xext/shm.c
 350 --- xorg-server-1.6.5/Xext/shm.c        2009-10-12 04:52:40.000000000 +0200
 351 +++ xorg-server-1.6.5-proto/Xext/shm.c  2010-04-29 13:19:15.674123946 +0200
 352 @@ -55,7 +55,7 @@
 353  #include "shmint.h"
 354  #include "xace.h"
 355  #define _XSHM_SERVER_
 356 -#include <X11/extensions/shmstr.h>
 357 +#include <X11/extensions/shmproto.h>
 358  #include <X11/Xfuncproto.h>
 359
 360  /* Needed for Solaris cross-zone shared memory extension */
 361 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/shmint.h xorg-server-1.6.5-proto/Xext/shmint.h
 362 --- xorg-server-1.6.5/Xext/shmint.h     2009-10-12 04:52:40.000000000 +0200
 363 +++ xorg-server-1.6.5-proto/Xext/shmint.h       2009-10-28 07:56:18.000000000 +0100
 364 @@ -23,17 +23,47 @@
 365  #ifndef _SHMINT_H_
 366  #define _SHMINT_H_
 367
 368 -#define _XSHM_SERVER_
 369 -#include <X11/extensions/shmstr.h>
 370 +#include <X11/extensions/shmproto.h>
 371
 372  #include "screenint.h"
 373  #include "pixmap.h"
 374  #include "gc.h"
 375
 376 -void
 377 +#define XSHM_PUT_IMAGE_ARGS \
 378 +    DrawablePtr                /* dst */, \
 379 +    GCPtr              /* pGC */, \
 380 +    int                        /* depth */, \
 381 +    unsigned int       /* format */, \
 382 +    int                        /* w */, \
 383 +    int                        /* h */, \
 384 +    int                        /* sx */, \
 385 +    int                        /* sy */, \
 386 +    int                        /* sw */, \
 387 +    int                        /* sh */, \
 388 +    int                        /* dx */, \
 389 +    int                        /* dy */, \
 390 +    char *             /* data */
 391 +
 392 +#define XSHM_CREATE_PIXMAP_ARGS \
 393 +    ScreenPtr  /* pScreen */, \
 394 +    int                /* width */, \
 395 +    int                /* height */, \
 396 +    int                /* depth */, \
 397 +    char *     /* addr */
 398 +
 399 +typedef struct _ShmFuncs {
 400 +    PixmapPtr  (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
 401 +    void       (* PutImage)(XSHM_PUT_IMAGE_ARGS);
 402 +} ShmFuncs, *ShmFuncsPtr;
 403 +
 404 +extern _X_EXPORT void
 405  ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
 406
 407 -void
 408 +extern _X_EXPORT void
 409  ShmRegisterFbFuncs(ScreenPtr pScreen);
 410
 411 +extern _X_EXPORT RESTYPE ShmSegType;
 412 +extern _X_EXPORT int ShmCompletionCode;
 413 +extern _X_EXPORT int BadShmSegCode;
 414 +
 415  #endif /* _SHMINT_H_ */
 416 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/sync.c xorg-server-1.6.5-proto/Xext/sync.c
 417 --- xorg-server-1.6.5/Xext/sync.c       2009-10-12 04:52:40.000000000 +0200
 418 +++ xorg-server-1.6.5-proto/Xext/sync.c 2010-04-29 13:18:20.755124734 +0200
 419 @@ -68,8 +68,8 @@
 420  #include "resource.h"
 421  #include "opaque.h"
 422  #define _SYNC_SERVER
 423 -#include <X11/extensions/sync.h>
 424 -#include <X11/extensions/syncstr.h>
 425 +#include <X11/extensions/syncproto.h>
 426 +#include "syncsrv.h"
 427
 428  #include <stdio.h>
 429  #if !defined(WIN32)
 430 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/syncsrv.h xorg-server-1.6.5-proto/Xext/syncsrv.h
 431 --- xorg-server-1.6.5/Xext/syncsrv.h    1970-01-01 01:00:00.000000000 +0100
 432 +++ xorg-server-1.6.5-proto/Xext/syncsrv.h      2009-10-28 07:56:18.000000000 +0100
 433 @@ -0,0 +1,177 @@
 434 +/*
 435 +
 436 +Copyright 1991, 1993, 1994, 1998  The Open Group
 437 +
 438 +Permission to use, copy, modify, distribute, and sell this software and its
 439 +documentation for any purpose is hereby granted without fee, provided that
 440 +the above copyright notice appear in all copies and that both that
 441 +copyright notice and this permission notice appear in supporting
 442 +documentation.
 443 +
 444 +The above copyright notice and this permission notice shall be included in
 445 +all copies or substantial portions of the Software.
 446 +
 447 +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 448 +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 449 +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 450 +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 451 +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 452 +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 453 +
 454 +Except as contained in this notice, the name of The Open Group shall not be
 455 +used in advertising or otherwise to promote the sale, use or other dealings
 456 +in this Software without prior written authorization from The Open Group.
 457 +
 458 +*/
 459 +
 460 +/***********************************************************
 461 +Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
 462 +and Olivetti Research Limited, Cambridge, England.
 463 +
 464 +                        All Rights Reserved
 465 +
 466 +Permission to use, copy, modify, and distribute this software and its
 467 +documentation for any purpose and without fee is hereby granted,
 468 +provided that the above copyright notice appear in all copies and that
 469 +both that copyright notice and this permission notice appear in
 470 +supporting documentation, and that the names of Digital or Olivetti
 471 +not be used in advertising or publicity pertaining to distribution of the
 472 +software without specific, written prior permission.
 473 +
 474 +DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
 475 +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
 476 +FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 477 +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
 478 +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 479 +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 480 +PERFORMANCE OF THIS SOFTWARE.
 481 +
 482 +******************************************************************/
 483 +
 484 +#ifndef _SYNCSRV_H_
 485 +#define _SYNCSRV_H_
 486 +
 487 +#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
 488 +
 489 +typedef struct _SyncCounter {
 490 +    ClientPtr          client; /* Owning client. 0 for system counters */
 491 +    XSyncCounter       id;             /* resource ID */
 492 +    CARD64             value;          /* counter value */
 493 +    struct _SyncTriggerList *pTriglist;        /* list of triggers */
 494 +    Bool               beingDestroyed; /* in process of going away */
 495 +    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
 496 +} SyncCounter;
 497 +
 498 +/*
 499 + * The System Counter interface
 500 + */
 501 +
 502 +typedef enum {
 503 +    XSyncCounterNeverChanges,
 504 +    XSyncCounterNeverIncreases,
 505 +    XSyncCounterNeverDecreases,
 506 +    XSyncCounterUnrestricted
 507 +} SyncCounterType;
 508 +
 509 +typedef struct _SysCounterInfo {
 510 +    char       *name;
 511 +    CARD64     resolution;
 512 +    CARD64     bracket_greater;
 513 +    CARD64     bracket_less;
 514 +    SyncCounterType counterType;  /* how can this counter change */
 515 +    void        (*QueryValue)(
 516 +                             pointer /*pCounter*/,
 517 +                             CARD64 * /*freshvalue*/
 518 +);
 519 +    void       (*BracketValues)(
 520 +                                pointer /*pCounter*/,
 521 +                                CARD64 * /*lessthan*/,
 522 +                                CARD64 * /*greaterthan*/
 523 +);
 524 +} SysCounterInfo;
 525 +
 526 +
 527 +
 528 +typedef struct _SyncTrigger {
 529 +    SyncCounter *pCounter;
 530 +    CARD64     wait_value;     /* wait value */
 531 +    unsigned int value_type;     /* Absolute or Relative */
 532 +    unsigned int test_type;    /* transition or Comparision type */
 533 +    CARD64     test_value;     /* trigger event threshold value */
 534 +    Bool       (*CheckTrigger)(
 535 +                               struct _SyncTrigger * /*pTrigger*/,
 536 +                               CARD64 /*newval*/
 537 +                               );
 538 +    void       (*TriggerFired)(
 539 +                               struct _SyncTrigger * /*pTrigger*/
 540 +                               );
 541 +    void       (*CounterDestroyed)(
 542 +                               struct _SyncTrigger * /*pTrigger*/
 543 +                                   );
 544 +} SyncTrigger;
 545 +
 546 +typedef struct _SyncTriggerList {
 547 +    SyncTrigger *pTrigger;
 548 +    struct _SyncTriggerList *next;
 549 +} SyncTriggerList;
 550 +
 551 +typedef struct _SyncAlarmClientList {
 552 +    ClientPtr  client;
 553 +    XID                delete_id;
 554 +    struct _SyncAlarmClientList *next;
 555 +} SyncAlarmClientList;
 556 +
 557 +typedef struct _SyncAlarm {
 558 +    SyncTrigger trigger;
 559 +    ClientPtr  client;
 560 +    XSyncAlarm         alarm_id;
 561 +    CARD64     delta;
 562 +    int                events;
 563 +    int                state;
 564 +    SyncAlarmClientList *pEventClients;
 565 +} SyncAlarm;
 566 +
 567 +typedef struct {
 568 +    ClientPtr  client;
 569 +    CARD32     delete_id;
 570 +    int                num_waitconditions;
 571 +} SyncAwaitHeader;
 572 +
 573 +typedef struct {
 574 +    SyncTrigger trigger;
 575 +    CARD64     event_threshold;
 576 +    SyncAwaitHeader *pHeader;
 577 +} SyncAwait;
 578 +
 579 +typedef union {
 580 +    SyncAwaitHeader header;
 581 +    SyncAwait      await;
 582 +} SyncAwaitUnion;
 583 +
 584 +
 585 +extern pointer SyncCreateSystemCounter(
 586 +    char *     /* name */,
 587 +    CARD64     /* inital_value */,
 588 +    CARD64     /* resolution */,
 589 +    SyncCounterType /* change characterization */,
 590 +    void        (* /*QueryValue*/ ) (
 591 +        pointer /* pCounter */,
 592 +        CARD64 * /* pValue_return */), /* XXX prototype */
 593 +    void        (* /*BracketValues*/) (
 594 +        pointer /* pCounter */,
 595 +        CARD64 * /* pbracket_less */,
 596 +        CARD64 * /* pbracket_greater */)
 597 +);
 598 +
 599 +extern void SyncChangeCounter(
 600 +    SyncCounter *      /* pCounter*/,
 601 +    CARD64             /* new_value */
 602 +);
 603 +
 604 +extern void SyncDestroySystemCounter(
 605 +    pointer pCounter
 606 +);
 607 +extern void InitServertime(void);
 608 +
 609 +extern void SyncExtensionInit(void);
 610 +#endif /* _SYNCSRV_H_ */
 611 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/xtest.c xorg-server-1.6.5-proto/Xext/xtest.c
 612 --- xorg-server-1.6.5/Xext/xtest.c      2009-10-12 04:52:40.000000000 +0200
 613 +++ xorg-server-1.6.5-proto/Xext/xtest.c        2010-04-29 13:18:50.685186679 +0200
 614 @@ -44,8 +44,7 @@
 615  #include "sleepuntil.h"
 616  #include "mi.h"
 617  #define _XTEST_SERVER_
 618 -#include <X11/extensions/XTest.h>
 619 -#include <X11/extensions/xteststr.h>
 620 +#include <X11/extensions/xtestproto.h>
 621  #include <X11/extensions/XI.h>
 622  #include <X11/extensions/XIproto.h>
 623
 624 diff -urN -x '*.*lo' -x '*.la' -x .deps -x 'Makefile*' xorg-server-1.6.5/Xext/xvdisp.c xorg-server-1.6.5-proto/Xext/xvdisp.c
 625 --- xorg-server-1.6.5/Xext/xvdisp.c     2009-10-12 04:52:40.000000000 +0200
 626 +++ xorg-server-1.6.5-proto/Xext/xvdisp.c       2010-04-29 13:20:03.274124723 +0200
 627 @@ -43,7 +43,7 @@
 628  #include "xvdix.h"
 629  #ifdef MITSHM
 630  #define _XSHM_SERVER_
 631 -#include <X11/extensions/shmstr.h>
 632 +#include <X11/extensions/shmproto.h>
 633  #endif
 634
 635  #include "xvdisp.h"