Clear header file namespace separation (<X11/...> vs. <nx-X11/...>).

 In the process of building nxagent against more and more system-wide installed
 X.org libraries, we come to the limit of including structs from this (bundled
 nx-X11) and that (system-wide X.Org) library.

 This commit introduces a clear namespace separation of headers provided by
 nx-X11 and headers provided by X.Org. This approach is only temporary as we
 want to drop all nx-X11 bundled libraries from nx-libs.

 However, for a while we need to make this separation clear and also ship
 some reduced fake X.Org headers that avoid pulling in libX* and libNX_X*
 symbols at the same time.

 This patch has been tested on Debian jessie and unstable and requires no
 overall testing on various distros and distro versions, as we finally will
 drop all libNX_X* libraries and build against X.org's client libs.

 For now, this hack eases our development / cleanup process.

4 files changed, 11 insertions, 11 deletions

diff --git a/nx-X11/programs/nxauth/gethost.c b/nx-X11/programs/nxauth/gethost.c
index cab2aea9f..fa889f29b 100644
--- a/nx-X11/programs/nxauth/gethost.c
+++ b/nx-X11/programs/nxauth/gethost.c
@@ -36,10 +36,10 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #ifdef WIN32
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
 #define EPROTOTYPE WSAEPROTOTYPE
 #endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include <signal.h>
 #include <setjmp.h>
 #include <ctype.h>
diff --git a/nx-X11/programs/nxauth/parsedpy.c b/nx-X11/programs/nxauth/parsedpy.c
index 8ce46815c..d0f022574 100644
--- a/nx-X11/programs/nxauth/parsedpy.c
+++ b/nx-X11/programs/nxauth/parsedpy.c
@@ -49,12 +49,12 @@ in this Software without prior written authorization from The Open Group.
 
 #include <stdio.h>			/* for NULL */
 #include <ctype.h>			/* for isascii() and isdigit() */
-#include <X11/Xos.h>			/* for strchr() and string routines */
-#include <X11/Xlib.h>			/* for Family contants */
+#include <nx-X11/Xos.h>			/* for strchr() and string routines */
+#include <nx-X11/Xlib.h>			/* for Family contants */
 #ifdef hpux
 #include <sys/utsname.h>		/* for struct utsname */
 #endif
-#include <X11/Xauth.h>			/* for FamilyLocal */
+#include <nx-X11/Xauth.h>			/* for FamilyLocal */
 
 #if defined(UNIXCONN) || defined(LOCALCONN)
 #define UNIX_CONNECTION "unix"
diff --git a/nx-X11/programs/nxauth/process.c b/nx-X11/programs/nxauth/process.c
index 76259d76a..86aba2b2a 100644
--- a/nx-X11/programs/nxauth/process.c
+++ b/nx-X11/programs/nxauth/process.c
@@ -55,10 +55,10 @@ from The Open Group.
 #include <sys/stat.h>
 
 #include <signal.h>
-/*#include <X11/X.h>*/			/* for Family constants */
+/*#include <nx-X11/X.h>*/			/* for Family constants */
 /*
-#include <X11/Xlib.h>
-#include <X11/extensions/security.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/extensions/security.h>
 */
 
 /*FIXME*/
diff --git a/nx-X11/programs/nxauth/xauth.h b/nx-X11/programs/nxauth/xauth.h
index 33a6c4e3b..4f8490070 100644
--- a/nx-X11/programs/nxauth/xauth.h
+++ b/nx-X11/programs/nxauth/xauth.h
@@ -29,9 +29,9 @@ in this Software without prior written authorization from The Open Group.
 /* $XFree86: xc/programs/xauth/xauth.h,v 1.6 2001/12/14 20:01:15 dawes Exp $ */
 
 #include <stdio.h>
-#include <X11/Xos.h>
-#include <X11/Xauth.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xauth.h>
+#include <nx-X11/Xfuncs.h>
 
 #ifndef True
 typedef int Bool;