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/GL/glx/Imakefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/GL/glx')

diff --git a/nx-X11/programs/Xserver/GL/glx/Imakefile b/nx-X11/programs/Xserver/GL/glx/Imakefile
index 05dfed738..24a35d22e 100644
--- a/nx-X11/programs/Xserver/GL/glx/Imakefile
+++ b/nx-X11/programs/Xserver/GL/glx/Imakefile
@@ -31,6 +31,8 @@ NXAGENT_SKIP_SRCS =                     \
 NXAGENT_SKIP_OBJS =                     \
                 glxext.o                \
                 $(NULL)
+#else
+       NX_DEFINES = -DNXAGENT_SERVER
 #endif
 
          SRCS = global.c                \
@@ -124,8 +126,12 @@ NXAGENT_SKIP_OBJS =                     \
 
 XCOMM If you add "-DDEBUG" in DEFINES, then make sure you also
 XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c
-      DEFINES = $(GLX_DEFINES) $(NO_EXT_DEFS) $(APIENTRY_DEFS)
-
+      DEFINES = 			\
+                $(GLX_DEFINES)		\
+                $(NO_EXT_DEFS)		\
+                $(APIENTRY_DEFS)	\
+                $(NX_DEFINES)		\
+                $(NULL)
 
 #ifdef IHaveModules
 ModuleObjectRule()
-- 
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/GL/glx/glxserver.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nx-X11/programs/Xserver/GL/glx')

diff --git a/nx-X11/programs/Xserver/GL/glx/glxserver.h b/nx-X11/programs/Xserver/GL/glx/glxserver.h
index 4238de537..a04d361fd 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxserver.h
+++ b/nx-X11/programs/Xserver/GL/glx/glxserver.h
@@ -52,7 +52,7 @@
 #include <resource.h>
 #include <scrnintstr.h>
 #include "GL/glx_ansic.h"
-
+#include "protocol-versions.h"
 
 #include <limits.h>
 /*
@@ -75,8 +75,8 @@ typedef struct __GLXdrawablePrivateRec __GLXdrawablePrivate;
 #include "glxerror.h"
 
 
-#define GLX_SERVER_MAJOR_VERSION 1
-#define GLX_SERVER_MINOR_VERSION 2
+#define GLX_SERVER_MAJOR_VERSION SERVER_GLX_MAJOR_VERSION
+#define GLX_SERVER_MINOR_VERSION SERVER_GLX_MINOR_VERSION
 
 #ifndef True
 #define True 1
-- 
cgit v1.2.3