Merge branch 'sunweaver-pr/NX-include-path' into 3.6.x

Attributes GH PR #61: https://github.com/ArcticaProject/nx-libs/pull/61

25 files changed, 50 insertions, 50 deletions

diff --git a/nx-X11/programs/Xserver/mi/mi.h b/nx-X11/programs/Xserver/mi/mi.h
index 0f3f5778f..6eea34b6c 100644
--- a/nx-X11/programs/Xserver/mi/mi.h
+++ b/nx-X11/programs/Xserver/mi/mi.h
@@ -49,7 +49,7 @@ SOFTWARE.
 
 #ifndef MI_H
 #define MI_H
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "region.h"
 #include "validate.h"
 #include "window.h"
diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c
index f06c4b51d..8db188a6e 100644
--- a/nx-X11/programs/Xserver/mi/miarc.c
+++ b/nx-X11/programs/Xserver/mi/miarc.c
@@ -62,8 +62,8 @@ SOFTWARE.
 #include <math.h>
 #undef _XOPEN_SOURCE
 #endif
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "misc.h"
 #include "gcstruct.h"
 #include "scrnintstr.h"
@@ -72,7 +72,7 @@ SOFTWARE.
 #include "mifpoly.h"
 #include "mi.h"
 #include "mifillarc.h"
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 static double miDsin(double a);
 static double miDcos(double a);
diff --git a/nx-X11/programs/Xserver/mi/mibitblt.c b/nx-X11/programs/Xserver/mi/mibitblt.c
index 0caad083f..60318a046 100644
--- a/nx-X11/programs/Xserver/mi/mibitblt.c
+++ b/nx-X11/programs/Xserver/mi/mibitblt.c
@@ -52,8 +52,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 
 #include "misc.h"
 #include "gcstruct.h"
@@ -62,7 +62,7 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include "mi.h"
 #include "regionstr.h"
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 #include "servermd.h"
 
 #ifndef HAS_FFS
diff --git a/nx-X11/programs/Xserver/mi/mibstore.c b/nx-X11/programs/Xserver/mi/mibstore.c
index f18648f66..875ec87f3 100644
--- a/nx-X11/programs/Xserver/mi/mibstore.c
+++ b/nx-X11/programs/Xserver/mi/mibstore.c
@@ -49,9 +49,9 @@ implied warranty.
 #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 "regionstr.h"
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/mi/miclipn.c b/nx-X11/programs/Xserver/mi/miclipn.c
index 14ff0d69a..913b0e47a 100644
--- a/nx-X11/programs/Xserver/mi/miclipn.c
+++ b/nx-X11/programs/Xserver/mi/miclipn.c
@@ -32,7 +32,7 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "mi.h"
diff --git a/nx-X11/programs/Xserver/mi/micmap.c b/nx-X11/programs/Xserver/mi/micmap.c
index 98f3e521d..15d3f7f46 100644
--- a/nx-X11/programs/Xserver/mi/micmap.c
+++ b/nx-X11/programs/Xserver/mi/micmap.c
@@ -40,8 +40,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "resource.h"
diff --git a/nx-X11/programs/Xserver/mi/miexpose.c b/nx-X11/programs/Xserver/mi/miexpose.c
index f3dae5768..782ddad49 100644
--- a/nx-X11/programs/Xserver/mi/miexpose.c
+++ b/nx-X11/programs/Xserver/mi/miexpose.c
@@ -80,10 +80,10 @@ Equipment Corporation.
 #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 "regionstr.h"
@@ -95,7 +95,7 @@ Equipment Corporation.
 
 #include "dixstruct.h"
 #include "mi.h"
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 #include "globals.h"
 
diff --git a/nx-X11/programs/Xserver/mi/mifillarc.c b/nx-X11/programs/Xserver/mi/mifillarc.c
index 0dcf25d05..533bfe996 100644
--- a/nx-X11/programs/Xserver/mi/mifillarc.c
+++ b/nx-X11/programs/Xserver/mi/mifillarc.c
@@ -34,8 +34,8 @@ Author:  Bob Scheifler, MIT X Consortium
 #endif
 
 #include <math.h>
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mifillrct.c b/nx-X11/programs/Xserver/mi/mifillrct.c
index 9f68db720..8a8f2b4f3 100644
--- a/nx-X11/programs/Xserver/mi/mifillrct.c
+++ b/nx-X11/programs/Xserver/mi/mifillrct.c
@@ -51,8 +51,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmap.h"
diff --git a/nx-X11/programs/Xserver/mi/mifpolycon.c b/nx-X11/programs/Xserver/mi/mifpolycon.c
index 40b83586f..95b81bbb6 100644
--- a/nx-X11/programs/Xserver/mi/mifpolycon.c
+++ b/nx-X11/programs/Xserver/mi/mifpolycon.c
@@ -51,7 +51,7 @@ SOFTWARE.
 #endif
 
 #include <math.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index b70a6a67e..f4ff4c243 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -191,35 +191,35 @@ typedef void (*InitExtension)(INITARGS);
 
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <nx-X11/extensions/shmstr.h>
 #endif
 #ifdef XTEST
 #define _XTEST_SERVER_
-#include <X11/extensions/XTest.h>
+#include <nx-X11/extensions/XTest.h>
 #endif
 #ifdef XKB
-#include <X11/extensions/XKB.h>
+#include <nx-X11/extensions/XKB.h>
 #endif
 #ifdef LBX
 #define _XLBX_SERVER_
-#include <X11/extensions/lbxstr.h>
+#include <nx-X11/extensions/lbxstr.h>
 #endif
 #ifdef XAPPGROUP
 #define _XAG_SERVER_
-#include <X11/extensions/Xagstr.h>
+#include <nx-X11/extensions/Xagstr.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/securstr.h>
+#include <nx-X11/extensions/securstr.h>
 #endif
 #ifdef PANORAMIX
-#include <X11/extensions/panoramiXproto.h>
+#include <nx-X11/extensions/panoramiXproto.h>
 #endif
 #ifdef XF86BIGFONT
-#include <X11/extensions/xf86bigfstr.h>
+#include <nx-X11/extensions/xf86bigfstr.h>
 #endif
 #ifdef RES
-#include <X11/extensions/XResproto.h>
+#include <nx-X11/extensions/XResproto.h>
 #endif
 
 /* FIXME: this whole block of externs should be from the appropriate headers */
diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c
index 732e47af0..f67704e11 100644
--- a/nx-X11/programs/Xserver/mi/mioverlay.c
+++ b/nx-X11/programs/Xserver/mi/mioverlay.c
@@ -4,7 +4,7 @@
 #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/mi/mipoly.c b/nx-X11/programs/Xserver/mi/mipoly.c
index 403d3da56..11214a732 100644
--- a/nx-X11/programs/Xserver/mi/mipoly.c
+++ b/nx-X11/programs/Xserver/mi/mipoly.c
@@ -60,7 +60,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mipolygen.c b/nx-X11/programs/Xserver/mi/mipolygen.c
index c3d9ef397..98fe21d50 100644
--- a/nx-X11/programs/Xserver/mi/mipolygen.c
+++ b/nx-X11/programs/Xserver/mi/mipolygen.c
@@ -50,7 +50,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "gcstruct.h"
 #include "miscanfill.h"
 #include "mipoly.h"
diff --git a/nx-X11/programs/Xserver/mi/mipolypnt.c b/nx-X11/programs/Xserver/mi/mipolypnt.c
index 5d615c28d..dcbdf85d0 100644
--- a/nx-X11/programs/Xserver/mi/mipolypnt.c
+++ b/nx-X11/programs/Xserver/mi/mipolypnt.c
@@ -50,8 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "pixmapstr.h"
 #include "gcstruct.h"
 #include "windowstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mipolyrect.c b/nx-X11/programs/Xserver/mi/mipolyrect.c
index 98e467f9f..9b21bb032 100644
--- a/nx-X11/programs/Xserver/mi/mipolyrect.c
+++ b/nx-X11/programs/Xserver/mi/mipolyrect.c
@@ -50,8 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmap.h"
diff --git a/nx-X11/programs/Xserver/mi/mipolyseg.c b/nx-X11/programs/Xserver/mi/mipolyseg.c
index dcf3d815a..bd3c93ed6 100644
--- a/nx-X11/programs/Xserver/mi/mipolyseg.c
+++ b/nx-X11/programs/Xserver/mi/mipolyseg.c
@@ -50,8 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmap.h"
diff --git a/nx-X11/programs/Xserver/mi/mipushpxl.c b/nx-X11/programs/Xserver/mi/mipushpxl.c
index 5fce1cae7..44834db50 100644
--- a/nx-X11/programs/Xserver/mi/mipushpxl.c
+++ b/nx-X11/programs/Xserver/mi/mipushpxl.c
@@ -50,7 +50,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/miregion.c b/nx-X11/programs/Xserver/mi/miregion.c
index 5ec4ec55a..1df0dcc46 100644
--- a/nx-X11/programs/Xserver/mi/miregion.c
+++ b/nx-X11/programs/Xserver/mi/miregion.c
@@ -82,7 +82,7 @@ Equipment Corporation.
 #endif
 
 #include "regionstr.h"
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xprotostr.h>
 #include "gc.h"
 #include "mi.h"
 #include "mispans.h"
diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c
index 78e2af5a4..4950eaa93 100644
--- a/nx-X11/programs/Xserver/mi/miscrinit.c
+++ b/nx-X11/programs/Xserver/mi/miscrinit.c
@@ -32,7 +32,7 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "servermd.h"
 #include "misc.h"
 #include "mi.h"
@@ -42,7 +42,7 @@ from The Open Group.
 #include "miline.h"
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include <X11/extensions/XShm.h>
+#include <nx-X11/extensions/XShm.h>
 #endif
 
 /* We use this structure to propogate some information from miScreenInit to
diff --git a/nx-X11/programs/Xserver/mi/miwideline.c b/nx-X11/programs/Xserver/mi/miwideline.c
index 44cf18f2e..fa9ef4591 100644
--- a/nx-X11/programs/Xserver/mi/miwideline.c
+++ b/nx-X11/programs/Xserver/mi/miwideline.c
@@ -47,7 +47,7 @@ from The Open Group.
 #include <math.h>
 #undef _XOPEN_SOURCE
 #endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "regionstr.h"
diff --git a/nx-X11/programs/Xserver/mi/miwindow.c b/nx-X11/programs/Xserver/mi/miwindow.c
index 179c6e31e..44b7ada60 100644
--- a/nx-X11/programs/Xserver/mi/miwindow.c
+++ b/nx-X11/programs/Xserver/mi/miwindow.c
@@ -50,7 +50,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "regionstr.h"
 #include "region.h"
 #include "mi.h"
diff --git a/nx-X11/programs/Xserver/mi/mizerarc.c b/nx-X11/programs/Xserver/mi/mizerarc.c
index 62402f41b..4b4d724a6 100644
--- a/nx-X11/programs/Xserver/mi/mizerarc.c
+++ b/nx-X11/programs/Xserver/mi/mizerarc.c
@@ -40,8 +40,8 @@ Author:  Bob Scheifler, MIT X Consortium
 #endif
 
 #include <math.h>
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mizerclip.c b/nx-X11/programs/Xserver/mi/mizerclip.c
index e648b21d4..6acfc7fe0 100644
--- a/nx-X11/programs/Xserver/mi/mizerclip.c
+++ b/nx-X11/programs/Xserver/mi/mizerclip.c
@@ -49,7 +49,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 
 #include "misc.h"
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mizerline.c b/nx-X11/programs/Xserver/mi/mizerline.c
index 8e62a8c94..5a61ff5d6 100644
--- a/nx-X11/programs/Xserver/mi/mizerline.c
+++ b/nx-X11/programs/Xserver/mi/mizerline.c
@@ -50,7 +50,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 
 #include "misc.h"
 #include "scrnintstr.h"