frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ../xserver

This commit is contained in:
Greg Kroah-Hartman 2006-06-07 13:20:21 -07:00
parent 21ebcfd702 36d786e9f0
commit 785c978970
6 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored Normal file
View File

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

1
Xext/panoramiX.c
View File

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

4
Xext/xevie.c
View File

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

2
dix/devices.c
View File

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

2
dix/dispatch.c
View File

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

1
include/globals.h
View File

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