diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
| commit | 82967ab5e087a2fdfcb984f990ba117da68a5b60 (patch) | |
| tree | 52ca72e09a0d1d0ecacfb51a8b0b5d1c8193449c /xorg-server/xfixes/xfixes.c | |
| parent | f02db4f3b9d748e1fd06e3ae2985b9cf1547cc7e (diff) | |
| parent | 67b353c9ce039b254ba2e92cd6f842c505a8bd21 (diff) | |
| download | vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.gz vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.bz2 vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released
Diffstat (limited to 'xorg-server/xfixes/xfixes.c')
| -rw-r--r-- | xorg-server/xfixes/xfixes.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/xorg-server/xfixes/xfixes.c b/xorg-server/xfixes/xfixes.c index 25c92ea93..fa360b88e 100644 --- a/xorg-server/xfixes/xfixes.c +++ b/xorg-server/xfixes/xfixes.c @@ -52,13 +52,11 @@ #endif #include "xfixesint.h" - +#include "protocol-versions.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 static unsigned char XFixesReqCode; int XFixesEventBase; @@ -80,16 +78,16 @@ ProcXFixesQueryVersion(ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - if (stuff->majorVersion < SERVER_XFIXES_MAJOR) { + if (stuff->majorVersion < SERVER_XFIXES_MAJOR_VERSION) { rep.majorVersion = stuff->majorVersion; rep.minorVersion = stuff->minorVersion; } else { - rep.majorVersion = SERVER_XFIXES_MAJOR; - if (stuff->majorVersion == SERVER_XFIXES_MAJOR && - stuff->minorVersion < SERVER_XFIXES_MINOR) + rep.majorVersion = SERVER_XFIXES_MAJOR_VERSION; + if (stuff->majorVersion == SERVER_XFIXES_MAJOR_VERSION && + stuff->minorVersion < SERVER_XFIXES_MINOR_VERSION) rep.minorVersion = stuff->minorVersion; else - rep.minorVersion = SERVER_XFIXES_MINOR; + rep.minorVersion = SERVER_XFIXES_MINOR_VERSION; } pXFixesClient->major_version = rep.majorVersion; pXFixesClient->minor_version = rep.minorVersion; |