diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 13:53:16 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 13:53:16 +0200 |
| commit | 279d37127db241a9ee685f6b671f51aa21a972ea (patch) | |
| tree | e41ad6d5cd85b97101c9fd3d37be951eee1a409e /nx-X11/programs/Xserver/xfixes | |
| parent | dd5f5b56b48127641ca2bf70a272f60872f2568b (diff) | |
| parent | 487870fff5cd1bc3db5ade4f5721f483f96119c7 (diff) | |
| download | nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.tar.gz nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.tar.bz2 nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.zip | |
Merge branch 'sunweaver-pr/protocols-version-h' into 3.6.x
Attributes GH PR #160: https://github.com/ArcticaProject/nx-libs/pull/160
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:42:42 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes')
| -rwxr-xr-x | nx-X11/programs/Xserver/xfixes/Imakefile | 10 | ||||
| -rwxr-xr-x | nx-X11/programs/Xserver/xfixes/xfixes.c | 19 |
2 files changed, 20 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/Imakefile b/nx-X11/programs/Xserver/xfixes/Imakefile index 84f7c6f16..83e368488 100755 --- a/nx-X11/programs/Xserver/xfixes/Imakefile +++ b/nx-X11/programs/Xserver/xfixes/Imakefile @@ -1,5 +1,7 @@ #include <Server.tmpl> + NULL = + SRCS = cursor.c region.c saveset.c select.c xfixes.c OBJS = cursor.o region.o saveset.o select.o xfixes.o @@ -10,6 +12,14 @@ LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln +#if defined(NXAgentServer) && NXAgentServer + NX_DEFINES = -DNXAGENT_SERVER +#endif + + DEFINES = \ + $(NX_DEFINES) \ + $(NULL) + NormalLibraryTarget(xfixes,$(OBJS)) NormalLibraryObjectRule() LintLibraryTarget(xfixes,$(SRCS)) 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; |