X11/nx-X11 clear-up: More places where we need to explicitly distinguish between…

nx-X11/extras/Mesa/include/GL/xmesa.h

@@ -75,8 +75,8 @@ extern "C" {
 #ifdef XFree86Server
 #include "xmesa_xf86.h"
 #else
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xutil.h>
 #include "xmesa_x.h"
 #endif
 #include "GL/gl.h"

nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c

@@ -39,7 +39,7 @@
 # include "imports.h"
 # define __glXMemset  memset
 #else
-# include <X11/X.h>
+# include <nx-X11/X.h>
 # include <GL/glx.h>
 # include "GL/glxint.h"
 
@@ -51,7 +51,7 @@ extern void __glXFree( void * ptr );
 #  define _mesa_malloc(b) __glXMalloc(b)
 #  define _mesa_free(m)   __glXFree(m)
 # else
-#  include <X11/Xlibint.h>
+#  include <nx-X11/Xlibint.h>
 #  define __glXMemset  memset
 #  define _mesa_malloc(b) Xmalloc(b)
 #  define _mesa_free(m) Xfree(m)

nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h

@@ -43,12 +43,12 @@
 
 #else
 
-# include <X11/Xlib.h>
-# include <X11/Xutil.h>
+# include <nx-X11/Xlib.h>
+# include <nx-X11/Xutil.h>
 # ifdef USE_XSHM  /* was SHM */
 #  include <sys/ipc.h>
 #  include <sys/shm.h>
-#  include <X11/extensions/XShm.h>
+#  include <nx-X11/extensions/XShm.h>
 # endif
 # include <GL/glx.h>
 

nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h

@@ -31,7 +31,7 @@
 # include "GL/xf86glx.h"
 # include "xf86glx_util.h"
 #elif defined(USE_XSHM)
-# include <X11/extensions/XShm.h>
+# include <nx-X11/extensions/XShm.h>
 #endif
 #include "GL/xmesa.h"
 #include "mtypes.h"

nx-X11/extras/Mesa/src/mesa/glapi/glthread.h

@@ -180,7 +180,7 @@ typedef CRITICAL_SECTION _glthread_Mutex;
  * We wrap it again for GL.
  */
 #ifdef USE_XTHREADS
-#include <X11/Xthreads.h>
+#include <nx-X11/Xthreads.h>
 
 typedef struct {
    xthread_key_t key;

nx-X11/include/X.h

@@ -81,7 +81,7 @@ typedef unsigned long Atom;		/* Also in Xdefs.h */
 typedef unsigned long VisualID;
 typedef unsigned long Time;
 #else
-#  include <X11/Xmd.h>
+#  include <nx-X11/Xmd.h>
 #  ifndef _XTYPEDEF_XID
 #    define _XTYPEDEF_XID
 typedef CARD32 XID;

nx-X11/include/Xos_r.h

@@ -72,8 +72,8 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XOS_R_H_
 # define _XOS_R_H_
 
-# include <X11/Xos.h>
-# include <X11/Xfuncs.h>
+# include <nx-X11/Xos.h>
+# include <nx-X11/Xfuncs.h>
 
 # ifndef X_NOT_POSIX
 #  ifdef _POSIX_SOURCE
@@ -107,7 +107,7 @@ extern LockInfoPtr _Xglobal_lock;
 #  endif
 #  if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
 #   ifndef XAllocIDs /* Xlibint.h does not have multiple include protection */
-#    include <X11/Xfuncproto.h>	/* for NeedFunctionPrototypes */
+#    include <nx-X11/Xfuncproto.h>	/* for NeedFunctionPrototypes */
 extern void (*_XLockMutex_fn)(
 #    if NeedFunctionPrototypes
     LockInfoPtr	/* lock */, char * /* file */, int /* line */
@@ -129,7 +129,7 @@ extern void (*_XUnlockMutex_fn)(
 #   endif
 #  else
 #   ifndef XAllocIDs /* Xlibint.h does not have multiple include protection */
-#    include <X11/Xfuncproto.h>	/* for NeedFunctionPrototypes */
+#    include <nx-X11/Xfuncproto.h>	/* for NeedFunctionPrototypes */
 extern void (*_XLockMutex_fn)(
 #    if NeedFunctionPrototypes
     LockInfoPtr	/* lock */
@@ -155,7 +155,7 @@ extern void (*_XUnlockMutex_fn)(
 extern void (*_XtProcessLock)(void);
 #  endif
 #  ifndef _XtintrinsicP_h
-#   include <X11/Xfuncproto.h>	/* for NeedFunctionPrototypes */
+#   include <nx-X11/Xfuncproto.h>	/* for NeedFunctionPrototypes */
 extern void XtProcessLock(
 #   if NeedFunctionPrototypes
     void

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)                      \

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>
 
 /* 

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"

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>
 

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

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 */

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)

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

nx-X11/programs/Xserver/damageext/damageextint.h

@@ -36,7 +36,7 @@
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/damageproto.h>
+#include <nx-X11/extensions/damageproto.h>
 #include "windowstr.h"
 #include "selection.h"
 #include "scrnintstr.h"

nx-X11/programs/Xserver/hw/nxagent/NXdamage.c

@@ -43,7 +43,7 @@
 #include <dix-config.h>
 #endif
 
-#include    <X11/X.h>
+#include    <nx-X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
 #include    <X11/fonts/font.h>

nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h

@@ -51,7 +51,7 @@
 #ifndef _XRANDR_H_
 #define _XRANDR_H_
 
-#include <X11/extensions/randr.h>
+#include <nx-X11/extensions/randr.h>
 #include <nx-X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN

nx-X11/programs/Xserver/mi/midispcur.c

@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #define NEED_EVENTS
-# include   <X11/X.h>
+# include   <nx-X11/X.h>
 # include   "misc.h"
 # include   "input.h"
 # include   "cursorstr.h"

nx-X11/programs/Xserver/mi/mieq.c

@@ -35,9 +35,9 @@ in this Software without prior written authorization from The Open Group.
  */
 
 # define NEED_EVENTS
-# 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   "windowstr.h"
 # include   "pixmapstr.h"

nx-X11/programs/Xserver/mi/miglblt.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	<X11/fonts/fontstruct.h>
 #include	"dixfontstr.h"

nx-X11/programs/Xserver/mi/mipointer.c

@@ -35,9 +35,9 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 # define NEED_EVENTS
-# 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   "windowstr.h"
 # include   "pixmapstr.h"

nx-X11/programs/Xserver/mi/mipolytext.c

@@ -59,9 +59,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	"gcstruct.h"
 #include	<X11/fonts/fontstruct.h>

nx-X11/programs/Xserver/mi/misprite.c

@@ -36,8 +36,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
-# include   <X11/X.h>
-# include   <X11/Xproto.h>
+# include   <nx-X11/X.h>
+# include   <nx-X11/Xproto.h>
 # include   "misc.h"
 # include   "pixmapstr.h"
 # include   "input.h"

nx-X11/programs/Xserver/mi/mivaltree.c

@@ -96,7 +96,7 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include    <X11/X.h>
+#include    <nx-X11/X.h>
 #include    "scrnintstr.h"
 #include    "validate.h"
 #include    "windowstr.h"

nx-X11/programs/Xserver/miext/damage/damage.c

@@ -26,7 +26,7 @@
 #include <dix-config.h>
 #endif
 
-#include    <X11/X.h>
+#include    <nx-X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
 #include    <X11/fonts/font.h>

nx-X11/programs/Xserver/xkb/ddxLoad.c

@@ -176,7 +176,7 @@ Win32System(const char *cmdline)
 # define TRANS_SERVER
 # define PRMSG(lvl,x,a,b,c) \
 	if (lvl <= 1) { LogMessage(X_ERROR,x,a,b,c); } else ((void)0)
-# include <X11/Xtrans/Xtransutil.c>
+# include <nx-X11/Xtrans/Xtransutil.c>
 # ifndef XKM_OUTPUT_DIR_MODE
 #  define XKM_OUTPUT_DIR_MODE 0755
 # endif