aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:17:21 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:17:21 +0100
commitca0f639a4ef9ad605f0e62577c84f2be73807ff3 (patch)
tree1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11/programs/Xserver/dix
parentf58006d932d907dc13d76084e9171de59ee27f16 (diff)
parent433d8186588698ce6a435fbff5e9d40a37b78be9 (diff)
downloadnx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.gz
nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.bz2
nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.zip
Merge branch 'sunweaver-pr/NX-include-path' into 3.6.x
Attributes GH PR #61: https://github.com/ArcticaProject/nx-libs/pull/61
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
-rw-r--r--nx-X11/programs/Xserver/dix/atom.c4
-rw-r--r--nx-X11/programs/Xserver/dix/colormap.c4
-rw-r--r--nx-X11/programs/Xserver/dix/cursor.c4
-rw-r--r--nx-X11/programs/Xserver/dix/devices.c8
-rw-r--r--nx-X11/programs/Xserver/dix/dispatch.c6
-rw-r--r--nx-X11/programs/Xserver/dix/dixfonts.c8
-rw-r--r--nx-X11/programs/Xserver/dix/dixutils.c8
-rw-r--r--nx-X11/programs/Xserver/dix/events.c10
-rw-r--r--nx-X11/programs/Xserver/dix/extension.c6
-rw-r--r--nx-X11/programs/Xserver/dix/gc.c6
-rw-r--r--nx-X11/programs/Xserver/dix/globals.c4
-rw-r--r--nx-X11/programs/Xserver/dix/grabs.c4
-rw-r--r--nx-X11/programs/Xserver/dix/initatoms.c4
-rw-r--r--nx-X11/programs/Xserver/dix/main.c8
-rw-r--r--nx-X11/programs/Xserver/dix/pixmap.c2
-rw-r--r--nx-X11/programs/Xserver/dix/privates.c2
-rw-r--r--nx-X11/programs/Xserver/dix/property.c6
-rw-r--r--nx-X11/programs/Xserver/dix/resource.c2
-rw-r--r--nx-X11/programs/Xserver/dix/swaprep.c4
-rw-r--r--nx-X11/programs/Xserver/dix/swapreq.c6
-rw-r--r--nx-X11/programs/Xserver/dix/tables.c4
-rw-r--r--nx-X11/programs/Xserver/dix/window.c4
22 files changed, 57 insertions, 57 deletions
diff --git a/nx-X11/programs/Xserver/dix/atom.c b/nx-X11/programs/Xserver/dix/atom.c
index 207174280..583f2dafc 100644
--- a/nx-X11/programs/Xserver/dix/atom.c
+++ b/nx-X11/programs/Xserver/dix/atom.c
@@ -52,8 +52,8 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
-#include <X11/Xatom.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xatom.h>
#include "misc.h"
#include "resource.h"
#include "dix.h"
diff --git a/nx-X11/programs/Xserver/dix/colormap.c b/nx-X11/programs/Xserver/dix/colormap.c
index 32d9bae89..11a353f84 100644
--- a/nx-X11/programs/Xserver/dix/colormap.c
+++ b/nx-X11/programs/Xserver/dix/colormap.c
@@ -53,9 +53,9 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
#include "misc.h"
#include "dix.h"
#include "colormapst.h"
diff --git a/nx-X11/programs/Xserver/dix/cursor.c b/nx-X11/programs/Xserver/dix/cursor.c
index 187dd62c5..1e1dba36b 100644
--- a/nx-X11/programs/Xserver/dix/cursor.c
+++ b/nx-X11/programs/Xserver/dix/cursor.c
@@ -53,8 +53,8 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
#include "servermd.h"
#include "scrnintstr.h"
#include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c
index 917a3849a..91a92644c 100644
--- a/nx-X11/programs/Xserver/dix/devices.c
+++ b/nx-X11/programs/Xserver/dix/devices.c
@@ -54,12 +54,12 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#include "misc.h"
#include "resource.h"
#define NEED_EVENTS
#define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
#include "windowstr.h"
#include "inputstr.h"
#include "scrnintstr.h"
@@ -68,11 +68,11 @@ SOFTWARE.
#include "site.h"
#define XKB_IN_SERVER
#ifdef XKB
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
#endif
#ifdef XCSECURITY
#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
#endif
#ifdef LBX
#include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c
index 71c22ae0e..b6010e627 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -109,15 +109,15 @@ int ProcInitialConnection();
#endif
#ifdef XCSECURITY
#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
#endif
#ifdef XAPPGROUP
-#include <X11/extensions/Xagsrv.h>
+#include <nx-X11/extensions/Xagsrv.h>
#endif
#ifdef XKB
#define XKB_IN_SERVER
#include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
#endif
#ifdef LBX
#include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c
index fac918963..6e515300d 100644
--- a/nx-X11/programs/Xserver/dix/dixfonts.c
+++ b/nx-X11/programs/Xserver/dix/dixfonts.c
@@ -56,9 +56,9 @@ Equipment Corporation.
#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 "scrnintstr.h"
#include "resource.h"
#include "dixstruct.h"
@@ -139,7 +139,7 @@ _NXGetFontPathError:
#ifdef XF86BIGFONT
#define _XF86BIGFONT_SERVER_
-#include <X11/extensions/xf86bigfont.h>
+#include <nx-X11/extensions/xf86bigfont.h>
#endif
#define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics
diff --git a/nx-X11/programs/Xserver/dix/dixutils.c b/nx-X11/programs/Xserver/dix/dixutils.c
index f3b3373d0..8bcfce619 100644
--- a/nx-X11/programs/Xserver/dix/dixutils.c
+++ b/nx-X11/programs/Xserver/dix/dixutils.c
@@ -88,18 +88,18 @@ Author: Adobe Systems Incorporated
#include <dix-config.h>
#endif
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
#include "misc.h"
#include "windowstr.h"
#include "dixstruct.h"
#include "pixmapstr.h"
#include "scrnintstr.h"
#define XK_LATIN1
-#include <X11/keysymdef.h>
+#include <nx-X11/keysymdef.h>
#ifdef XCSECURITY
#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
#endif
/*
diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c
index ab995a772..1166bf84b 100644
--- a/nx-X11/programs/Xserver/dix/events.c
+++ b/nx-X11/programs/Xserver/dix/events.c
@@ -115,12 +115,12 @@ of the copyright holder.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#include "misc.h"
#include "resource.h"
#define NEED_EVENTS
#define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
#include "windowstr.h"
#include "inputstr.h"
#include "scrnintstr.h"
@@ -134,13 +134,13 @@ of the copyright holder.
#include "globals.h"
#ifdef XKB
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
#endif
#ifdef XCSECURITY
#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
#endif
#ifdef XEVIE
@@ -157,7 +157,7 @@ int xeviegrabState = 0;
xEvent *xeviexE;
#endif
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XIproto.h>
#include "exevents.h"
#include "extnsionst.h"
diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c
index 19333c151..dd6de9c63 100644
--- a/nx-X11/programs/Xserver/dix/extension.c
+++ b/nx-X11/programs/Xserver/dix/extension.c
@@ -51,10 +51,10 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#define NEED_EVENTS
#define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
@@ -63,7 +63,7 @@ SOFTWARE.
#include "dispatch.h"
#ifdef XCSECURITY
#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
#endif
#ifdef LBX
#include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/dix/gc.c b/nx-X11/programs/Xserver/dix/gc.c
index 834919946..2c17de3d6 100644
--- a/nx-X11/programs/Xserver/dix/gc.c
+++ b/nx-X11/programs/Xserver/dix/gc.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 "resource.h"
#include "gcstruct.h"
diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c
index 15eedf602..e4f43fd01 100644
--- a/nx-X11/programs/Xserver/dix/globals.c
+++ b/nx-X11/programs/Xserver/dix/globals.c
@@ -53,8 +53,8 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
#include "misc.h"
#include "windowstr.h"
#include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/dix/grabs.c b/nx-X11/programs/Xserver/dix/grabs.c
index e133c0dfc..839e930b1 100644
--- a/nx-X11/programs/Xserver/dix/grabs.c
+++ b/nx-X11/programs/Xserver/dix/grabs.c
@@ -52,10 +52,10 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#include "misc.h"
#define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
#include "windowstr.h"
#include "inputstr.h"
#include "cursorstr.h"
diff --git a/nx-X11/programs/Xserver/dix/initatoms.c b/nx-X11/programs/Xserver/dix/initatoms.c
index a5972afd6..5f6244a76 100644
--- a/nx-X11/programs/Xserver/dix/initatoms.c
+++ b/nx-X11/programs/Xserver/dix/initatoms.c
@@ -7,8 +7,8 @@
#include <dix-config.h>
#endif
-#include <X11/X.h>
-#include <X11/Xatom.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xatom.h>
#include "misc.h"
#include "dix.h"
void MakePredeclaredAtoms()
diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c
index 954c260c2..6a5b0021d 100644
--- a/nx-X11/programs/Xserver/dix/main.c
+++ b/nx-X11/programs/Xserver/dix/main.c
@@ -84,9 +84,9 @@ Equipment Corporation.
#include <dix-config.h>
#endif
-#include <X11/X.h>
-#include <X11/Xos.h> /* for unistd.h */
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xos.h> /* for unistd.h */
+#include <nx-X11/Xproto.h>
#include "scrnintstr.h"
#include "misc.h"
#include "os.h"
@@ -113,7 +113,7 @@ Equipment Corporation.
#ifdef DPMSExtension
#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <nx-X11/extensions/dpms.h>
#include "dpmsproc.h"
#endif
diff --git a/nx-X11/programs/Xserver/dix/pixmap.c b/nx-X11/programs/Xserver/dix/pixmap.c
index 7888cf90a..463e31598 100644
--- a/nx-X11/programs/Xserver/dix/pixmap.c
+++ b/nx-X11/programs/Xserver/dix/pixmap.c
@@ -32,7 +32,7 @@ from The Open Group.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#include "scrnintstr.h"
#include "misc.h"
#include "os.h"
diff --git a/nx-X11/programs/Xserver/dix/privates.c b/nx-X11/programs/Xserver/dix/privates.c
index 36bbc65d1..d08883d1d 100644
--- a/nx-X11/programs/Xserver/dix/privates.c
+++ b/nx-X11/programs/Xserver/dix/privates.c
@@ -33,7 +33,7 @@ from The Open Group.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#include "scrnintstr.h"
#include "misc.h"
#include "os.h"
diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c
index f462a3ebd..51cbc1a0d 100644
--- a/nx-X11/programs/Xserver/dix/property.c
+++ b/nx-X11/programs/Xserver/dix/property.c
@@ -51,10 +51,10 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#define NEED_REPLIES
#define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
#include "windowstr.h"
#include "propertyst.h"
#include "dixstruct.h"
@@ -62,7 +62,7 @@ SOFTWARE.
#include "swaprep.h"
#ifdef XCSECURITY
#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
#endif
#ifdef LBX
#include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/dix/resource.c b/nx-X11/programs/Xserver/dix/resource.c
index e0fc2b997..ed8a255f5 100644
--- a/nx-X11/programs/Xserver/dix/resource.c
+++ b/nx-X11/programs/Xserver/dix/resource.c
@@ -106,7 +106,7 @@ Equipment Corporation.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#include "misc.h"
#include "os.h"
#include "resource.h"
diff --git a/nx-X11/programs/Xserver/dix/swaprep.c b/nx-X11/programs/Xserver/dix/swaprep.c
index 9776cd437..b8f245408 100644
--- a/nx-X11/programs/Xserver/dix/swaprep.c
+++ b/nx-X11/programs/Xserver/dix/swaprep.c
@@ -52,10 +52,10 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#define NEED_REPLIES
#define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
#include "misc.h"
#include "dixstruct.h"
#include <X11/fonts/fontstruct.h>
diff --git a/nx-X11/programs/Xserver/dix/swapreq.c b/nx-X11/programs/Xserver/dix/swapreq.c
index 7d57d551f..35a7e7527 100644
--- a/nx-X11/programs/Xserver/dix/swapreq.c
+++ b/nx-X11/programs/Xserver/dix/swapreq.c
@@ -52,10 +52,10 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#define NEED_EVENTS
-#include <X11/Xproto.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xprotostr.h>
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h" /* for SendEvent */
diff --git a/nx-X11/programs/Xserver/dix/tables.c b/nx-X11/programs/Xserver/dix/tables.c
index 5196f0e85..eb4f4c8d2 100644
--- a/nx-X11/programs/Xserver/dix/tables.c
+++ b/nx-X11/programs/Xserver/dix/tables.c
@@ -51,10 +51,10 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
#define NEED_EVENTS
#define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
#include "windowstr.h"
#include "extnsionst.h"
#include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c
index 340ca50cc..5854f2e95 100644
--- a/nx-X11/programs/Xserver/dix/window.c
+++ b/nx-X11/programs/Xserver/dix/window.c
@@ -105,11 +105,11 @@ Equipment Corporation.
#include "globals.h"
#ifdef XAPPGROUP
-#include <X11/extensions/Xagsrv.h>
+#include <nx-X11/extensions/Xagsrv.h>
#endif
#ifdef XCSECURITY
#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
#endif
/******