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/programs/Xserver/mi/midispcur.c  | 2 +-
 nx-X11/programs/Xserver/mi/mieq.c       | 6 +++---
 nx-X11/programs/Xserver/mi/miglblt.c    | 6 +++---
 nx-X11/programs/Xserver/mi/mipointer.c  | 6 +++---
 nx-X11/programs/Xserver/mi/mipolytext.c | 6 +++---
 nx-X11/programs/Xserver/mi/misprite.c   | 4 ++--
 nx-X11/programs/Xserver/mi/mivaltree.c  | 2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/nx-X11/programs/Xserver/mi/midispcur.c b/nx-X11/programs/Xserver/mi/midispcur.c
index d71234ffe..a16c2977e 100644
--- a/nx-X11/programs/Xserver/mi/midispcur.c
+++ b/nx-X11/programs/Xserver/mi/midispcur.c
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #define NEED_EVENTS
-# include   <X11/X.h>
+# include   <nx-X11/X.h>
 # include   "misc.h"
 # include   "input.h"
 # include   "cursorstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mieq.c b/nx-X11/programs/Xserver/mi/mieq.c
index 37662625e..14784433d 100644
--- a/nx-X11/programs/Xserver/mi/mieq.c
+++ b/nx-X11/programs/Xserver/mi/mieq.c
@@ -35,9 +35,9 @@ in this Software without prior written authorization from The Open Group.
  */
 
 # define NEED_EVENTS
-# include   <X11/X.h>
-# include   <X11/Xmd.h>
-# include   <X11/Xproto.h>
+# include   <nx-X11/X.h>
+# include   <nx-X11/Xmd.h>
+# include   <nx-X11/Xproto.h>
 # include   "misc.h"
 # include   "windowstr.h"
 # include   "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/miglblt.c b/nx-X11/programs/Xserver/mi/miglblt.c
index 3960fc212..8a9733424 100644
--- a/nx-X11/programs/Xserver/mi/miglblt.c
+++ b/nx-X11/programs/Xserver/mi/miglblt.c
@@ -52,9 +52,9 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include	<X11/X.h>
-#include	<X11/Xmd.h>
-#include	<X11/Xproto.h>
+#include	<nx-X11/X.h>
+#include	<nx-X11/Xmd.h>
+#include	<nx-X11/Xproto.h>
 #include	"misc.h"
 #include	<X11/fonts/fontstruct.h>
 #include	"dixfontstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mipointer.c b/nx-X11/programs/Xserver/mi/mipointer.c
index 869e74349..5e086f2a1 100644
--- a/nx-X11/programs/Xserver/mi/mipointer.c
+++ b/nx-X11/programs/Xserver/mi/mipointer.c
@@ -35,9 +35,9 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 # define NEED_EVENTS
-# include   <X11/X.h>
-# include   <X11/Xmd.h>
-# include   <X11/Xproto.h>
+# include   <nx-X11/X.h>
+# include   <nx-X11/Xmd.h>
+# include   <nx-X11/Xproto.h>
 # include   "misc.h"
 # include   "windowstr.h"
 # include   "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mipolytext.c b/nx-X11/programs/Xserver/mi/mipolytext.c
index c2bbaba38..92a51ac87 100644
--- a/nx-X11/programs/Xserver/mi/mipolytext.c
+++ b/nx-X11/programs/Xserver/mi/mipolytext.c
@@ -59,9 +59,9 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include	<X11/X.h>
-#include	<X11/Xmd.h>
-#include	<X11/Xproto.h>
+#include	<nx-X11/X.h>
+#include	<nx-X11/Xmd.h>
+#include	<nx-X11/Xproto.h>
 #include	"misc.h"
 #include	"gcstruct.h"
 #include	<X11/fonts/fontstruct.h>
diff --git a/nx-X11/programs/Xserver/mi/misprite.c b/nx-X11/programs/Xserver/mi/misprite.c
index 0ff6dacd6..a5e3f9ccf 100644
--- a/nx-X11/programs/Xserver/mi/misprite.c
+++ b/nx-X11/programs/Xserver/mi/misprite.c
@@ -36,8 +36,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
-# include   <X11/X.h>
-# include   <X11/Xproto.h>
+# include   <nx-X11/X.h>
+# include   <nx-X11/Xproto.h>
 # include   "misc.h"
 # include   "pixmapstr.h"
 # include   "input.h"
diff --git a/nx-X11/programs/Xserver/mi/mivaltree.c b/nx-X11/programs/Xserver/mi/mivaltree.c
index d745238b6..b9a42472f 100644
--- a/nx-X11/programs/Xserver/mi/mivaltree.c
+++ b/nx-X11/programs/Xserver/mi/mivaltree.c
@@ -96,7 +96,7 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include    <X11/X.h>
+#include    <nx-X11/X.h>
 #include    "scrnintstr.h"
 #include    "validate.h"
 #include    "windowstr.h"
-- 
cgit v1.2.3