X11/nx-X11 clear-up: More places where we need to explicitly distinguish between X11 and nx-X11 namespace regarding header include paths.

8 files changed, 15 insertions, 15 deletions

diff --git a/nx-X11/lib/X11/XrmI.h b/nx-X11/lib/X11/XrmI.h
index 949bcd6f3..6178a634c 100644
--- a/nx-X11/lib/X11/XrmI.h
+++ b/nx-X11/lib/X11/XrmI.h
@@ -34,7 +34,7 @@ from The Open Group.
  * You may need to redefine these for various other operating systems. 
  */
 
-#include	<X11/Xos.h>
+#include	<nx-X11/Xos.h>
 #include        <sys/stat.h>                        
 
 #define GetSizeOfFile(fd,size)                      \
diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h
index 8c877e697..d3c991944 100644
--- a/nx-X11/lib/X11/Xutil.h
+++ b/nx-X11/lib/X11/Xutil.h
@@ -51,7 +51,7 @@ SOFTWARE.
 #ifndef _XUTIL_H_
 #define _XUTIL_H_
 
-/* You must include <X11/Xlib.h> before including this file */
+/* You must include <nx-X11/Xlib.h> before including this file */
 #include <nx-X11/Xlib.h>
 
 /* 
diff --git a/nx-X11/lib/X11/imInsClbk.c b/nx-X11/lib/X11/imInsClbk.c
index ac39f9dfd..acf9f7b63 100644
--- a/nx-X11/lib/X11/imInsClbk.c
+++ b/nx-X11/lib/X11/imInsClbk.c
@@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include	<X11/Xatom.h>
+#include	<nx-X11/Xatom.h>
 #define NEED_EVENTS
 #include	"Xlibint.h"
 #include	"Xlcint.h"
diff --git a/nx-X11/lib/Xau/Xauth.h b/nx-X11/lib/Xau/Xauth.h
index fa9c96bf8..7ac8bf77b 100644
--- a/nx-X11/lib/Xau/Xauth.h
+++ b/nx-X11/lib/Xau/Xauth.h
@@ -45,8 +45,8 @@ typedef struct xauth {
 
 #ifndef _XAUTH_STRUCT_ONLY
 
-# include   <X11/Xfuncproto.h>
-# include   <X11/Xfuncs.h>
+# include   <nx-X11/Xfuncproto.h>
+# include   <nx-X11/Xfuncs.h>
 
 # include   <stdio.h>
 
diff --git a/nx-X11/lib/xtrans/Xtrans.h b/nx-X11/lib/xtrans/Xtrans.h
index ae808667e..f96e8862e 100644
--- a/nx-X11/lib/xtrans/Xtrans.h
+++ b/nx-X11/lib/xtrans/Xtrans.h
@@ -54,8 +54,8 @@ from The Open Group.
 #ifndef _XTRANS_H_
 #define _XTRANS_H_
 
-#include <X11/Xfuncproto.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xos.h>
 
 #ifndef WIN32
 #ifndef Lynx
diff --git a/nx-X11/lib/xtrans/Xtransdnet.c b/nx-X11/lib/xtrans/Xtransdnet.c
index ac91695c7..a1728f187 100644
--- a/nx-X11/lib/xtrans/Xtransdnet.c
+++ b/nx-X11/lib/xtrans/Xtransdnet.c
@@ -68,7 +68,7 @@ from The Open Group.
 #undef Status
 #define Status int
 #undef BOOL
-#include <X11/Xw32defs.h>
+#include <nx-X11/Xw32defs.h>
 #undef close
 #define close closesocket
 #endif /* WIN32 */
diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c
index 62feefed7..b08cd9f0a 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c
+++ b/nx-X11/lib/xtrans/Xtranssock.c
@@ -84,7 +84,7 @@ from the copyright holders.
 
 #include <ctype.h>
 #ifdef XTHREADS
-#include <X11/Xthreads.h>
+#include <nx-X11/Xthreads.h>
 #endif
 
 #ifndef WIN32
@@ -98,7 +98,7 @@ from the copyright holders.
 #if defined(TCPCONN) || defined(UNIXCONN)
 #define X_INCLUDE_NETDB_H
 #define XOS_USE_NO_LOCKING
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
 #endif
 
 #ifdef UNIXCONN
@@ -142,9 +142,9 @@ from the copyright holders.
 
 #else /* !WIN32 */
 
-#include <X11/Xwinsock.h>
-#include <X11/Xwindows.h>
-#include <X11/Xw32defs.h>
+#include <nx-X11/Xwinsock.h>
+#include <nx-X11/Xwindows.h>
+#include <nx-X11/Xw32defs.h>
 #undef close
 #define close closesocket
 #define ECONNREFUSED WSAECONNREFUSED
@@ -157,7 +157,7 @@ from the copyright holders.
 #define EINTR WSAEINTR
 #define X_INCLUDE_NETDB_H
 #define XOS_USE_MTSAFE_NETDBAPI
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
 #endif /* WIN32 */
 
 #if defined(SO_DONTLINGER) && defined(SO_LINGER)
diff --git a/nx-X11/lib/xtrans/Xtransutil.c b/nx-X11/lib/xtrans/Xtransutil.c
index 729e65caa..20e431ac8 100644
--- a/nx-X11/lib/xtrans/Xtransutil.c
+++ b/nx-X11/lib/xtrans/Xtransutil.c
@@ -59,7 +59,7 @@ from The Open Group.
  */
 
 #ifdef XTHREADS
-#include <X11/Xthreads.h>
+#include <nx-X11/Xthreads.h>
 #endif
 
 #ifdef X11_t