aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-29 17:27:47 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-29 17:41:24 +0100
commit9618380bde0b1e9bdc757055b378d93cac9d377f (patch)
treecb98b6673722a65af86f753247f59b38fb44474c /nx-X11/programs/Xserver
parenteafc94f1692e68e988ce70600440ccd01aa47b5a (diff)
downloadnx-libs-9618380bde0b1e9bdc757055b378d93cac9d377f.tar.gz
nx-libs-9618380bde0b1e9bdc757055b378d93cac9d377f.tar.bz2
nx-libs-9618380bde0b1e9bdc757055b378d93cac9d377f.zip
X11/nx-X11 clear-up: More places where we need to explicitly distinguish between X11 and nx-X11 namespace regarding header include paths.
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/damageext/damageextint.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdamage.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h2
-rw-r--r--nx-X11/programs/Xserver/mi/midispcur.c2
-rw-r--r--nx-X11/programs/Xserver/mi/mieq.c6
-rw-r--r--nx-X11/programs/Xserver/mi/miglblt.c6
-rw-r--r--nx-X11/programs/Xserver/mi/mipointer.c6
-rw-r--r--nx-X11/programs/Xserver/mi/mipolytext.c6
-rw-r--r--nx-X11/programs/Xserver/mi/misprite.c4
-rw-r--r--nx-X11/programs/Xserver/mi/mivaltree.c2
-rwxr-xr-xnx-X11/programs/Xserver/miext/damage/damage.c2
-rw-r--r--nx-X11/programs/Xserver/xkb/ddxLoad.c2
12 files changed, 21 insertions, 21 deletions
diff --git a/nx-X11/programs/Xserver/damageext/damageextint.h b/nx-X11/programs/Xserver/damageext/damageextint.h
index d2f9d71ac..0021dda9d 100644
--- a/nx-X11/programs/Xserver/damageext/damageextint.h
+++ b/nx-X11/programs/Xserver/damageext/damageextint.h
@@ -36,7 +36,7 @@
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
-#include <X11/extensions/damageproto.h>
+#include <nx-X11/extensions/damageproto.h>
#include "windowstr.h"
#include "selection.h"
#include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
index 06f2de57c..d18840dad 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
@@ -43,7 +43,7 @@
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
#include <X11/fonts/font.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
index 7515992a1..ea8dd12f8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
@@ -51,7 +51,7 @@
#ifndef _XRANDR_H_
#define _XRANDR_H_
-#include <X11/extensions/randr.h>
+#include <nx-X11/extensions/randr.h>
#include <nx-X11/Xfuncproto.h>
_XFUNCPROTOBEGIN
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"
diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c
index c2a98d422..0dd788ec3 100755
--- a/nx-X11/programs/Xserver/miext/damage/damage.c
+++ b/nx-X11/programs/Xserver/miext/damage/damage.c
@@ -26,7 +26,7 @@
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
#include <X11/fonts/font.h>
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index 16343fc9c..b3ef60f22 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c
@@ -176,7 +176,7 @@ Win32System(const char *cmdline)
# define TRANS_SERVER
# define PRMSG(lvl,x,a,b,c) \
if (lvl <= 1) { LogMessage(X_ERROR,x,a,b,c); } else ((void)0)
-# include <X11/Xtrans/Xtransutil.c>
+# include <nx-X11/Xtrans/Xtransutil.c>
# ifndef XKM_OUTPUT_DIR_MODE
# define XKM_OUTPUT_DIR_MODE 0755
# endif