From a08e2323e838099cc2079287c5b3fd1e9b7f20f7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 28 Jun 2016 12:06:50 +0200
Subject: Xserver Imakefiles: Make sure NXAGENT_SERVER is defined for all
 extensions.

---
 nx-X11/programs/Xserver/render/Imakefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/render')

diff --git a/nx-X11/programs/Xserver/render/Imakefile b/nx-X11/programs/Xserver/render/Imakefile
index 2d918458b..6c3a7880c 100644
--- a/nx-X11/programs/Xserver/render/Imakefile
+++ b/nx-X11/programs/Xserver/render/Imakefile
@@ -1,6 +1,6 @@
 XCOMM $XFree86: xc/programs/Xserver/render/Imakefile,v 1.10 2002/11/23 02:38:15 keithp Exp $
 
-NULL =
+             NULL =
 
 #include <Server.tmpl>
 
@@ -20,7 +20,7 @@ NXAGENT_SKIP_OBJS =             \
                     render.o    \
                     $(NULL)
 #else
-          DEFINES = -DNXAGENT_SERVER
+       NX_DEFINES = -DNXAGENT_SERVER
 #endif
 
        SRCS =   animcur.c \
@@ -53,6 +53,10 @@ NXAGENT_SKIP_OBJS =             \
                 `pkg-config --cflags-only-I pixman-1`
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
+    DEFINES = 			\
+              $(NX_DEFINES)	\
+              $(NULL)
+
 NormalLibraryTarget(render,$(OBJS))
 NormalLibraryObjectRule()
 LintLibraryTarget(render,$(SRCS))
-- 
cgit v1.2.3


From 487870fff5cd1bc3db5ade4f5721f483f96119c7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 28 Jun 2016 12:07:10 +0200
Subject: Xserver/include/protocol-versions.h: Switch to having an
 Xserver-specific header file containing all use protocol versions.

---
 nx-X11/programs/Xserver/render/render.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/render')

diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c
index c73ff8305..5a4114adc 100644
--- a/nx-X11/programs/Xserver/render/render.c
+++ b/nx-X11/programs/Xserver/render/render.c
@@ -52,6 +52,8 @@
 #include "xf86_ansic.h"
 #endif
 
+#include "protocol-versions.h"
+
 #if !defined(UINT32_MAX)
 #define UINT32_MAX 0xffffffffU
 #endif
@@ -293,8 +295,8 @@ ProcRenderQueryVersion (ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.majorVersion = RENDER_MAJOR;
-    rep.minorVersion = RENDER_MINOR;
+    rep.majorVersion = SERVER_RENDER_MAJOR_VERSION;
+    rep.minorVersion = SERVER_RENDER_MINOR_VERSION;
     if (client->swapped) {
     	swaps(&rep.sequenceNumber, n);
     	swapl(&rep.length, n);
-- 
cgit v1.2.3