diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-28 12:07:10 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 13:51:37 +0200 |
| commit | 487870fff5cd1bc3db5ade4f5721f483f96119c7 (patch) | |
| tree | e41ad6d5cd85b97101c9fd3d37be951eee1a409e /nx-X11/programs/Xserver/xfixes | |
| parent | a08e2323e838099cc2079287c5b3fd1e9b7f20f7 (diff) | |
| download | nx-libs-487870fff5cd1bc3db5ade4f5721f483f96119c7.tar.gz nx-libs-487870fff5cd1bc3db5ade4f5721f483f96119c7.tar.bz2 nx-libs-487870fff5cd1bc3db5ade4f5721f483f96119c7.zip | |
Xserver/include/protocol-versions.h: Switch to having an Xserver-specific header file containing all use protocol versions.
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes')
| -rwxr-xr-x | nx-X11/programs/Xserver/xfixes/xfixes.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/xfixes.c b/nx-X11/programs/Xserver/xfixes/xfixes.c index 3b3a0f305..f97a0632d 100755 --- a/nx-X11/programs/Xserver/xfixes/xfixes.c +++ b/nx-X11/programs/Xserver/xfixes/xfixes.c @@ -27,6 +27,7 @@ #endif #include "xfixesint.h" +#include "protocol-versions.h" unsigned char XFixesReqCode; int XFixesEventBase; @@ -46,16 +47,16 @@ ProcXFixesQueryVersion(ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - if (stuff->majorVersion < XFIXES_MAJOR) { - rep.majorVersion = stuff->majorVersion; - rep.minorVersion = stuff->minorVersion; + if (stuff->majorVersion < SERVER_XFIXES_MAJOR_VERSION) { + rep.majorVersion = stuff->majorVersion; + rep.minorVersion = stuff->minorVersion; } else { - rep.majorVersion = XFIXES_MAJOR; - if (stuff->majorVersion == XFIXES_MAJOR && - stuff->minorVersion < XFIXES_MINOR) - rep.minorVersion = stuff->minorVersion; - else - rep.minorVersion = 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_VERSION; } pXFixesClient->major_version = rep.majorVersion; pXFixesClient->minor_version = rep.minorVersion; |