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

Bug #6786: Use separate defines for server's Fixes support level.

This commit is contained in:
Adam Jackson 2006-11-08 12:03:37 -05:00
parent b5d09d4adb
commit 7e0aeebb8f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xfixes/xfixes.c
View File

@ -48,6 +48,13 @@
#include "xfixesint.h" #include "xfixesint.h"
/*
* Must use these instead of the constants from xfixeswire.h. They advertise
* what we implement, not what the protocol headers define.
*/
#define SERVER_XFIXES_MAJOR 4
#define SERVER_XFIXES_MINOR 0
unsigned char XFixesReqCode; unsigned char XFixesReqCode;
int XFixesEventBase; int XFixesEventBase;
int XFixesErrorBase; int XFixesErrorBase;
@ -65,16 +72,16 @@ ProcXFixesQueryVersion(ClientPtr client)
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
if (stuff->majorVersion < XFIXES_MAJOR) { if (stuff->majorVersion < SERVER_XFIXES_MAJOR) {
rep.majorVersion = stuff->majorVersion; rep.majorVersion = stuff->majorVersion;
rep.minorVersion = stuff->minorVersion; rep.minorVersion = stuff->minorVersion;
} else { } else {
rep.majorVersion = XFIXES_MAJOR; rep.majorVersion = SERVER_XFIXES_MAJOR;
if (stuff->majorVersion == XFIXES_MAJOR && if (stuff->majorVersion == SERVER_XFIXES_MAJOR &&
stuff->minorVersion < XFIXES_MINOR) stuff->minorVersion < SERVER_XFIXES_MINOR)
rep.minorVersion = stuff->minorVersion; rep.minorVersion = stuff->minorVersion;
else else
rep.minorVersion = XFIXES_MINOR; rep.minorVersion = SERVER_XFIXES_MINOR;
} }
pXFixesClient->major_version = rep.majorVersion; pXFixesClient->major_version = rep.majorVersion;
pXFixesClient->minor_version = rep.minorVersion; pXFixesClient->minor_version = rep.minorVersion;