From 9618380bde0b1e9bdc757055b378d93cac9d377f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 29 Dec 2015 17:27:47 +0100
Subject: X11/nx-X11 clear-up: More places where we need to explicitly
 distinguish between X11 and nx-X11 namespace regarding header include paths.

---
 nx-X11/extras/Mesa/include/GL/xmesa.h                           | 4 ++--
 nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c | 4 ++--
 nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h             | 6 +++---
 nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h                | 2 +-
 nx-X11/extras/Mesa/src/mesa/glapi/glthread.h                    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'nx-X11/extras')

diff --git a/nx-X11/extras/Mesa/include/GL/xmesa.h b/nx-X11/extras/Mesa/include/GL/xmesa.h
index ab813b23b..54662f81c 100644
--- a/nx-X11/extras/Mesa/include/GL/xmesa.h
+++ b/nx-X11/extras/Mesa/include/GL/xmesa.h
@@ -75,8 +75,8 @@ extern "C" {
 #ifdef XFree86Server
 #include "xmesa_xf86.h"
 #else
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xutil.h>
 #include "xmesa_x.h"
 #endif
 #include "GL/gl.h"
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
index 066c5ffba..bb1c82794 100644
--- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+++ b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
@@ -39,7 +39,7 @@
 # include "imports.h"
 # define __glXMemset  memset
 #else
-# include <X11/X.h>
+# include <nx-X11/X.h>
 # include <GL/glx.h>
 # include "GL/glxint.h"
 
@@ -51,7 +51,7 @@ extern void __glXFree( void * ptr );
 #  define _mesa_malloc(b) __glXMalloc(b)
 #  define _mesa_free(m)   __glXFree(m)
 # else
-#  include <X11/Xlibint.h>
+#  include <nx-X11/Xlibint.h>
 #  define __glXMemset  memset
 #  define _mesa_malloc(b) Xmalloc(b)
 #  define _mesa_free(m) Xfree(m)
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h
index 2533d5044..1e4db26f7 100644
--- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h
+++ b/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h
@@ -43,12 +43,12 @@
 
 #else
 
-# include <X11/Xlib.h>
-# include <X11/Xutil.h>
+# include <nx-X11/Xlib.h>
+# include <nx-X11/Xutil.h>
 # ifdef USE_XSHM  /* was SHM */
 #  include <sys/ipc.h>
 #  include <sys/shm.h>
-#  include <X11/extensions/XShm.h>
+#  include <nx-X11/extensions/XShm.h>
 # endif
 # include <GL/glx.h>
 
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h
index 26255ae56..640bdf954 100644
--- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h
+++ b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h
@@ -31,7 +31,7 @@
 # include "GL/xf86glx.h"
 # include "xf86glx_util.h"
 #elif defined(USE_XSHM)
-# include <X11/extensions/XShm.h>
+# include <nx-X11/extensions/XShm.h>
 #endif
 #include "GL/xmesa.h"
 #include "mtypes.h"
diff --git a/nx-X11/extras/Mesa/src/mesa/glapi/glthread.h b/nx-X11/extras/Mesa/src/mesa/glapi/glthread.h
index 53592aab3..5a860ddcc 100644
--- a/nx-X11/extras/Mesa/src/mesa/glapi/glthread.h
+++ b/nx-X11/extras/Mesa/src/mesa/glapi/glthread.h
@@ -180,7 +180,7 @@ typedef CRITICAL_SECTION _glthread_Mutex;
  * We wrap it again for GL.
  */
 #ifdef USE_XTHREADS
-#include <X11/Xthreads.h>
+#include <nx-X11/Xthreads.h>
 
 typedef struct {
    xthread_key_t key;
-- 
cgit v1.2.3