aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/damageext
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 13:53:16 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 13:53:16 +0200
commit279d37127db241a9ee685f6b671f51aa21a972ea (patch)
treee41ad6d5cd85b97101c9fd3d37be951eee1a409e /nx-X11/programs/Xserver/damageext
parentdd5f5b56b48127641ca2bf70a272f60872f2568b (diff)
parent487870fff5cd1bc3db5ade4f5721f483f96119c7 (diff)
downloadnx-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/damageext')
-rw-r--r--nx-X11/programs/Xserver/damageext/Imakefile10
-rwxr-xr-xnx-X11/programs/Xserver/damageext/damageext.c11
2 files changed, 16 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/damageext/Imakefile b/nx-X11/programs/Xserver/damageext/Imakefile
index 24dcee85c..d8cc1bfa4 100644
--- a/nx-X11/programs/Xserver/damageext/Imakefile
+++ b/nx-X11/programs/Xserver/damageext/Imakefile
@@ -1,5 +1,7 @@
#include <Server.tmpl>
+ NULL =
+
SRCS = damageext.c
OBJS = damageext.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(damage,$(OBJS))
NormalLibraryObjectRule()
LintLibraryTarget(damage,$(SRCS))
diff --git a/nx-X11/programs/Xserver/damageext/damageext.c b/nx-X11/programs/Xserver/damageext/damageext.c
index 8d03dfed5..d14f14985 100755
--- a/nx-X11/programs/Xserver/damageext/damageext.c
+++ b/nx-X11/programs/Xserver/damageext/damageext.c
@@ -27,6 +27,7 @@
#endif
#include "damageextint.h"
+#include "protocol-versions.h"
unsigned char DamageReqCode;
int DamageEventBase;
@@ -143,16 +144,16 @@ ProcDamageQueryVersion(ClientPtr client)
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- if (stuff->majorVersion < DAMAGE_MAJOR) {
+ if (stuff->majorVersion < SERVER_DAMAGE_MAJOR_VERSION) {
rep.majorVersion = stuff->majorVersion;
rep.minorVersion = stuff->minorVersion;
} else {
- rep.majorVersion = DAMAGE_MAJOR;
- if (stuff->majorVersion == DAMAGE_MAJOR &&
- stuff->minorVersion < DAMAGE_MINOR)
+ rep.majorVersion = SERVER_DAMAGE_MAJOR_VERSION;
+ if (stuff->majorVersion == SERVER_DAMAGE_MAJOR_VERSION &&
+ stuff->minorVersion < SERVER_DAMAGE_MINOR_VERSION)
rep.minorVersion = stuff->minorVersion;
else
- rep.minorVersion = DAMAGE_MINOR;
+ rep.minorVersion = SERVER_DAMAGE_MINOR_VERSION;
}
pDamageClient->major_version = rep.majorVersion;
pDamageClient->minor_version = rep.minorVersion;