From e3c11f66516521959127b9ab8fd88cc4c954f5bb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 7 Jun 2006 12:05:01 -0700 Subject: [PATCH 1/5] Added first cut at a .gitignore file to make using git easier. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..051d1bd50 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +Makefile +Makefile.in +.deps From e5b72bd9c6fb06640a5de4031be0dc9b04b4b215 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 7 Jun 2006 12:05:39 -0700 Subject: [PATCH 2/5] Remove 3 compiler warnings in the Xext/xevie.c file --- Xext/xevie.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Xext/xevie.c b/Xext/xevie.c index a468affcc..ccc12371a 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 client) static int ProcStart (register ClientPtr client) { - REQUEST (xXevieStartReq); xXevieStartReply rep; REQUEST_SIZE_MATCH (xXevieStartReq); From 101ae616962c355388722e05ab8413eb5f5c3402 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 7 Jun 2006 12:06:22 -0700 Subject: [PATCH 3/5] Add PanoramiXExtensionDisabledHack to globals.h as it was missing. --- Xext/panoramiX.c | 1 - include/globals.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index d1e726804..5d533a464 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 95e11fe70..d396d19c8 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 From 8f5aa38abf1158a789b5528df9d98826342e30cf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 7 Jun 2006 12:33:44 -0700 Subject: [PATCH 4/5] fix compiler warning about XKB_IN_SERVER redefinition --- dix/devices.c | 2 ++ dix/dispatch.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dix/devices.c b/dix/devices.c index ef1bdf354..c7d3494e8 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 #endif diff --git a/dix/dispatch.c b/dix/dispatch.c index c8ee8d610..04e2ba11f 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -115,7 +115,9 @@ int ProcInitialConnection(); #include #endif #ifdef XKB +#ifndef XKB_IN_SERVER #define XKB_IN_SERVER +#endif #include "inputstr.h" #include #endif From 36d786e9f051c5c95c1cc8c098c84e118ed3cc85 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 7 Jun 2006 12:47:50 -0700 Subject: [PATCH 5/5] add more files to .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 051d1bd50..cacc3c5d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ Makefile Makefile.in .deps +.libs +*.lo +*.la +*.o