xserver: Branch 'master' - 6 commits

[Greg Kroah-Hartman]

 .gitignore        |    7 +++++++
 Xext/panoramiX.c  |    1 -
 Xext/xevie.c      |    4 +---
 dix/devices.c     |    2 ++
 dix/dispatch.c    |    2 ++
 include/globals.h |    1 +
 6 files changed, 13 insertions(+), 4 deletions(-)

New commits:
diff-tree 785c9789704ed142fe98cd17b5995e4a95b7141f (from parents)
Merge: 21ebcfd7027b2a6182d4065e56a2ef814f5181ae 36d786e9f051c5c95c1cc8c098c84e118ed3cc85
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 13:20:21 2006 -0700

    Merge ../xserver

diff-tree 36d786e9f051c5c95c1cc8c098c84e118ed3cc85 (from 8f5aa38abf1158a789b5528df9d98826342e30cf)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 12:47:50 2006 -0700

    add more files to .gitignore

diff --git a/.gitignore b/.gitignore
index 051d1bd..cacc3c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 Makefile
 Makefile.in
 .deps
+.libs
+*.lo
+*.la
+*.o
diff-tree 8f5aa38abf1158a789b5528df9d98826342e30cf (from 101ae616962c355388722e05ab8413eb5f5c3402)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 12:33:44 2006 -0700

    fix compiler warning about XKB_IN_SERVER redefinition

diff --git a/dix/devices.c b/dix/devices.c
index ef1bdf3..c7d3494 100644
--- a/dix/devices.c
+++ b/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
diff --git a/dix/dispatch.c b/dix/dispatch.c
index c8ee8d6..04e2ba1 100644
--- a/dix/dispatch.c
+++ b/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
diff-tree 101ae616962c355388722e05ab8413eb5f5c3402 (from e5b72bd9c6fb06640a5de4031be0dc9b04b4b215)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 12:06:22 2006 -0700

    Add PanoramiXExtensionDisabledHack to globals.h as it was missing.

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index d1e7268..5d533a4 100644
--- a/Xext/panoramiX.c
+++ b/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
diff --git a/include/globals.h b/include/globals.h
index 95e11fe..d396d19 100644
--- a/include/globals.h
+++ b/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
diff-tree e5b72bd9c6fb06640a5de4031be0dc9b04b4b215 (from e3c11f66516521959127b9ab8fd88cc4c954f5bb)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 12:05:39 2006 -0700

    Remove 3 compiler warnings in the Xext/xevie.c file

diff --git a/Xext/xevie.c b/Xext/xevie.c
index a468aff..ccc1237 100644
--- a/Xext/xevie.c
+++ b/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
 static
 int ProcStart (register ClientPtr client)
 {
-    REQUEST (xXevieStartReq);
     xXevieStartReply rep;
 
     REQUEST_SIZE_MATCH (xXevieStartReq);
diff-tree e3c11f66516521959127b9ab8fd88cc4c954f5bb (from f90761b06eaa5fa44fe85289e54eed5f47eff3b9)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 12:05:01 2006 -0700

    Added first cut at a .gitignore file to make using git easier.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..051d1bd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+.deps