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

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

15 files changed, 24 insertions, 24 deletions

diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile
index d68ef940c..4c9b169a4 100644
--- a/nx-X11/programs/Xserver/include/Imakefile
+++ b/nx-X11/programs/Xserver/include/Imakefile
@@ -63,5 +63,5 @@ InstallDriverSDKNonExecFile(validate.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(window.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(windowstr.h,$(DRIVERSDKINCLUDEDIR))
 
-BuildIncludes($(HEADERS),X11,..)
-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS))
+BuildIncludes($(HEADERS),nx-X11,..)
+InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS))
diff --git a/nx-X11/programs/Xserver/include/closestr.h b/nx-X11/programs/Xserver/include/closestr.h
index c06010113..31b5693f5 100644
--- a/nx-X11/programs/Xserver/include/closestr.h
+++ b/nx-X11/programs/Xserver/include/closestr.h
@@ -33,7 +33,7 @@ from The Open Group.
 #define CLOSESTR_H
 
 #define	NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "closure.h"
 #include "dix.h"
 #include "misc.h"
diff --git a/nx-X11/programs/Xserver/include/colormap.h b/nx-X11/programs/Xserver/include/colormap.h
index d519bb782..67f44193d 100644
--- a/nx-X11/programs/Xserver/include/colormap.h
+++ b/nx-X11/programs/Xserver/include/colormap.h
@@ -50,7 +50,7 @@ SOFTWARE.
 #ifndef CMAP_H
 #define CMAP_H 1
 
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "screenint.h"
 #include "window.h"
 
diff --git a/nx-X11/programs/Xserver/include/dixfontstr.h b/nx-X11/programs/Xserver/include/dixfontstr.h
index 948bf1adb..09a162451 100644
--- a/nx-X11/programs/Xserver/include/dixfontstr.h
+++ b/nx-X11/programs/Xserver/include/dixfontstr.h
@@ -30,7 +30,7 @@ SOFTWARE.
 #include <X11/fonts/fontstruct.h>
 #include "closure.h"
 #define NEED_REPLIES
-#include <X11/Xproto.h> /* for xQueryFontReply */
+#include <nx-X11/Xproto.h> /* for xQueryFontReply */
 
 #define FONTCHARSET(font)	  (font)
 #define FONTMAXBOUNDS(font,field) (font)->info.maxbounds.field
diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h
index 53c78d2de..e4b5e9fe8 100644
--- a/nx-X11/programs/Xserver/include/dixstruct.h
+++ b/nx-X11/programs/Xserver/include/dixstruct.h
@@ -31,7 +31,7 @@ SOFTWARE.
 #include "cursor.h"
 #include "gc.h"
 #include "pixmap.h"
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 /*
  * 	direct-mapped hash table, used by resource manager to store
diff --git a/nx-X11/programs/Xserver/include/gc.h b/nx-X11/programs/Xserver/include/gc.h
index 1c0c90d3e..1969e5cd7 100644
--- a/nx-X11/programs/Xserver/include/gc.h
+++ b/nx-X11/programs/Xserver/include/gc.h
@@ -50,15 +50,15 @@ SOFTWARE.
 #ifndef GC_H
 #define GC_H 
 
-#include <X11/X.h>	/* for GContext, Mask */
+#include <nx-X11/X.h>	/* for GContext, Mask */
 
 #ifndef _XTYPEDEF_POINTER
 /* Don't let Xdefs.h define 'pointer' */
 #define _XTYPEDEF_POINTER       1
 #endif /* _XTYPEDEF_POINTER */
-#include <X11/Xdefs.h>	/* for Bool */
+#include <nx-X11/Xdefs.h>	/* for Bool */
 
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "screenint.h"	/* for ScreenPtr */
 #include "pixmap.h"	/* for DrawablePtr */
 
diff --git a/nx-X11/programs/Xserver/include/gcstruct.h b/nx-X11/programs/Xserver/include/gcstruct.h
index 16779f692..71d3ace47 100644
--- a/nx-X11/programs/Xserver/include/gcstruct.h
+++ b/nx-X11/programs/Xserver/include/gcstruct.h
@@ -58,7 +58,7 @@ SOFTWARE.
 #include "region.h"
 #include "pixmap.h"
 #include "screenint.h"
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xprotostr.h>
 
 /*
  * functions which modify the state of the GC
diff --git a/nx-X11/programs/Xserver/include/input.h b/nx-X11/programs/Xserver/include/input.h
index 88cc98050..a7c8d0dfe 100644
--- a/nx-X11/programs/Xserver/include/input.h
+++ b/nx-X11/programs/Xserver/include/input.h
@@ -52,8 +52,8 @@ SOFTWARE.
 
 #include "misc.h"
 #include "screenint.h"
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xproto.h>
 #include "window.h"     /* for WindowPtr */
 
 #define DEVICE_INIT	0
diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h
index 1576f1433..cb3051c94 100644
--- a/nx-X11/programs/Xserver/include/misc.h
+++ b/nx-X11/programs/Xserver/include/misc.h
@@ -77,16 +77,16 @@ OF THIS SOFTWARE.
 extern unsigned long globalSerialNumber;
 extern unsigned long serverGeneration;
 
-#include <X11/Xosdefs.h>
-#include <X11/Xfuncproto.h>
-#include <X11/Xmd.h>
-#include <X11/X.h>
+#include <nx-X11/Xosdefs.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/X.h>
 
 #ifndef _XTYPEDEF_POINTER
 /* Don't let Xdefs.h define 'pointer' */
 #define _XTYPEDEF_POINTER       1
 #endif /* _XTYPEDEF_POINTER */
-#include <X11/Xdefs.h>
+#include <nx-X11/Xdefs.h>
 
 #ifndef IN_MODULE
 #ifndef NULL
@@ -121,7 +121,7 @@ typedef struct _xReq *xReqPtr;
 
 #include "os.h" 	/* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
 #ifndef IN_MODULE
-#include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
+#include <nx-X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
 #endif
 
 #define NullBox ((BoxPtr)0)
diff --git a/nx-X11/programs/Xserver/include/miscstruct.h b/nx-X11/programs/Xserver/include/miscstruct.h
index 87874aae4..7df9240c9 100644
--- a/nx-X11/programs/Xserver/include/miscstruct.h
+++ b/nx-X11/programs/Xserver/include/miscstruct.h
@@ -51,7 +51,7 @@ SOFTWARE.
 #define MISCSTRUCT_H 1
 
 #include "misc.h"
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xprotostr.h>
 #include "gc.h"
 
 typedef xPoint DDXPointRec;
diff --git a/nx-X11/programs/Xserver/include/opaque.h b/nx-X11/programs/Xserver/include/opaque.h
index ca29afdc0..749b6f5b9 100644
--- a/nx-X11/programs/Xserver/include/opaque.h
+++ b/nx-X11/programs/Xserver/include/opaque.h
@@ -31,7 +31,7 @@ from The Open Group.
 #ifndef OPAQUE_H
 #define OPAQUE_H
 
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 #include "globals.h"
 
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index 551b35097..e150e1e0b 100644
--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -54,7 +54,7 @@ SOFTWARE.
 #include "misc.h"
 #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
 #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((void *)(_ptr))
-#include <X11/Xalloca.h>
+#include <nx-X11/Xalloca.h>
 #ifndef IN_MODULE
 #include <stdarg.h>
 #else
diff --git a/nx-X11/programs/Xserver/include/scrnintstr.h b/nx-X11/programs/Xserver/include/scrnintstr.h
index 297227493..0539ca516 100644
--- a/nx-X11/programs/Xserver/include/scrnintstr.h
+++ b/nx-X11/programs/Xserver/include/scrnintstr.h
@@ -56,7 +56,7 @@ SOFTWARE.
 #include "colormap.h"
 #include "cursor.h"
 #include "validate.h"
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "dix.h"
 
 typedef struct _PixmapFormat {
diff --git a/nx-X11/programs/Xserver/include/window.h b/nx-X11/programs/Xserver/include/window.h
index cbfed645f..571115365 100644
--- a/nx-X11/programs/Xserver/include/window.h
+++ b/nx-X11/programs/Xserver/include/window.h
@@ -53,7 +53,7 @@ SOFTWARE.
 #include "misc.h"
 #include "region.h"
 #include "screenint.h"
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 
 #define TOTALLY_OBSCURED 0
 #define UNOBSCURED 1
diff --git a/nx-X11/programs/Xserver/include/windowstr.h b/nx-X11/programs/Xserver/include/windowstr.h
index dab6fcf71..5c181bc51 100644
--- a/nx-X11/programs/Xserver/include/windowstr.h
+++ b/nx-X11/programs/Xserver/include/windowstr.h
@@ -58,7 +58,7 @@ SOFTWARE.
 #include "resource.h"	/* for ROOT_WINDOW_ID_BASE */
 #include "dix.h"
 #include "miscstruct.h"
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xprotostr.h>
 #include "opaque.h"
 
 #define GuaranteeNothing	0