Merge ../xserver

.gitignore

@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
+*.o

Xext/panoramiX.c

@@ -1049,7 +1049,6 @@ ProcXineramaIsActive(ClientPtr client)
     {
 	/* The following hack fools clients into thinking that Xinerama
 	 * is disabled even though it is not. */
-	extern Bool PanoramiXExtensionDisabledHack;
 	rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack;
     }
 #else

Xext/xevie.c

@@ -104,7 +104,7 @@ typedef struct {
 } xevieKeycQueueRec, *xevieKeycQueuePtr;
 
 #define KEYC_QUEUE_SIZE	    100
-xevieKeycQueueRec keycq[KEYC_QUEUE_SIZE] = {0, NULL};
+xevieKeycQueueRec keycq[KEYC_QUEUE_SIZE] = {{0, NULL}};
 static int keycqHead = 0, keycqTail = 0;
 
 static int              ProcDispatch (ClientPtr), SProcDispatch (ClientPtr);
@@ -165,7 +165,6 @@ void ResetProc (ExtensionEntry *extEntry)
 static 
 int ProcQueryVersion (register ClientPtr client)
 {
-    REQUEST (xXevieQueryVersionReq);
     xXevieQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH (xXevieQueryVersionReq);
@@ -181,7 +180,6 @@ int ProcQueryVersion (register ClientPtr client)
 static
 int ProcStart (register ClientPtr client)
 {
-    REQUEST (xXevieStartReq);
     xXevieStartReply rep;
 
     REQUEST_SIZE_MATCH (xXevieStartReq);

dix/devices.c

@@ -66,7 +66,9 @@ SOFTWARE.
 #include "cursorstr.h"
 #include "dixstruct.h"
 #include "site.h"
+#ifndef XKB_IN_SERVER
 #define	XKB_IN_SERVER
+#endif
 #ifdef XKB
 #include <X11/extensions/XKBsrv.h>
 #endif

dix/dispatch.c

@@ -115,7 +115,9 @@ int ProcInitialConnection();
 #include <X11/extensions/Xagsrv.h>
 #endif
 #ifdef XKB
+#ifndef XKB_IN_SERVER
 #define XKB_IN_SERVER
+#endif
 #include "inputstr.h"
 #include <X11/extensions/XKBsrv.h>
 #endif

include/globals.h

@@ -50,6 +50,7 @@ extern Bool PanoramiXMapped;
 extern Bool PanoramiXVisibilityNotifySent;
 extern Bool PanoramiXWindowExposureSent;
 extern Bool PanoramiXOneExposeRequest;
+extern Bool PanoramiXExtensionDisabledHack;
 #endif
 
 #ifdef BIGREQS