aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-29 17:27:47 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-29 17:41:24 +0100
commit9618380bde0b1e9bdc757055b378d93cac9d377f (patch)
treecb98b6673722a65af86f753247f59b38fb44474c
parenteafc94f1692e68e988ce70600440ccd01aa47b5a (diff)
downloadnx-libs-9618380bde0b1e9bdc757055b378d93cac9d377f.tar.gz
nx-libs-9618380bde0b1e9bdc757055b378d93cac9d377f.tar.bz2
nx-libs-9618380bde0b1e9bdc757055b378d93cac9d377f.zip
X11/nx-X11 clear-up: More places where we need to explicitly distinguish between X11 and nx-X11 namespace regarding header include paths.
-rw-r--r--nx-X11/extras/Mesa/include/GL/xmesa.h4
-rw-r--r--nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c4
-rw-r--r--nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h6
-rw-r--r--nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h2
-rw-r--r--nx-X11/extras/Mesa/src/mesa/glapi/glthread.h2
-rw-r--r--nx-X11/include/X.h2
-rw-r--r--nx-X11/include/Xos_r.h10
-rw-r--r--nx-X11/lib/X11/XrmI.h2
-rw-r--r--nx-X11/lib/X11/Xutil.h2
-rw-r--r--nx-X11/lib/X11/imInsClbk.c2
-rw-r--r--nx-X11/lib/Xau/Xauth.h4
-rw-r--r--nx-X11/lib/xtrans/Xtrans.h4
-rw-r--r--nx-X11/lib/xtrans/Xtransdnet.c2
-rw-r--r--nx-X11/lib/xtrans/Xtranssock.c12
-rw-r--r--nx-X11/lib/xtrans/Xtransutil.c2
-rw-r--r--nx-X11/programs/Xserver/damageext/damageextint.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdamage.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h2
-rw-r--r--nx-X11/programs/Xserver/mi/midispcur.c2
-rw-r--r--nx-X11/programs/Xserver/mi/mieq.c6
-rw-r--r--nx-X11/programs/Xserver/mi/miglblt.c6
-rw-r--r--nx-X11/programs/Xserver/mi/mipointer.c6
-rw-r--r--nx-X11/programs/Xserver/mi/mipolytext.c6
-rw-r--r--nx-X11/programs/Xserver/mi/misprite.c4
-rw-r--r--nx-X11/programs/Xserver/mi/mivaltree.c2
-rwxr-xr-xnx-X11/programs/Xserver/miext/damage/damage.c2
-rw-r--r--nx-X11/programs/Xserver/xkb/ddxLoad.c2
27 files changed, 51 insertions, 51 deletions
diff --git a/nx-X11/extras/Mesa/include/GL/xmesa.h b/nx-X11/extras/Mesa/include/GL/xmesa.h
index ab813b23b..54662f81c 100644
--- a/nx-X11/extras/Mesa/include/GL/xmesa.h
+++ b/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"
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
index 066c5ffba..bb1c82794 100644
--- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+++ b/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)
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h
index 2533d5044..1e4db26f7 100644
--- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h
+++ b/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>
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h
index 26255ae56..640bdf954 100644
--- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h
+++ b/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"
diff --git a/nx-X11/extras/Mesa/src/mesa/glapi/glthread.h b/nx-X11/extras/Mesa/src/mesa/glapi/glthread.h
index 53592aab3..5a860ddcc 100644
--- a/nx-X11/extras/Mesa/src/mesa/glapi/glthread.h
+++ b/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;
diff --git a/nx-X11/include/X.h b/nx-X11/include/X.h
index 0a9c501fb..2dbebdaea 100644
--- a/nx-X11/include/X.h
+++ b/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;
diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h
index 44b1eaacf..e7a8fd1af 100644
--- a/nx-X11/include/Xos_r.h
+++ b/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
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
diff --git a/nx-X11/programs/Xserver/damageext/damageextint.h b/nx-X11/programs/Xserver/damageext/damageextint.h
index d2f9d71ac..0021dda9d 100644
--- a/nx-X11/programs/Xserver/damageext/damageextint.h
+++ b/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"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
index 06f2de57c..d18840dad 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
+++ b/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>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
index 7515992a1..ea8dd12f8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
+++ b/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
diff --git a/nx-X11/programs/Xserver/mi/midispcur.c b/nx-X11/programs/Xserver/mi/midispcur.c
index d71234ffe..a16c2977e 100644
--- a/nx-X11/programs/Xserver/mi/midispcur.c
+++ b/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"
diff --git a/nx-X11/programs/Xserver/mi/mieq.c b/nx-X11/programs/Xserver/mi/mieq.c
index 37662625e..14784433d 100644
--- a/nx-X11/programs/Xserver/mi/mieq.c
+++ b/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"
diff --git a/nx-X11/programs/Xserver/mi/miglblt.c b/nx-X11/programs/Xserver/mi/miglblt.c
index 3960fc212..8a9733424 100644
--- a/nx-X11/programs/Xserver/mi/miglblt.c
+++ b/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"
diff --git a/nx-X11/programs/Xserver/mi/mipointer.c b/nx-X11/programs/Xserver/mi/mipointer.c
index 869e74349..5e086f2a1 100644
--- a/nx-X11/programs/Xserver/mi/mipointer.c
+++ b/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"
diff --git a/nx-X11/programs/Xserver/mi/mipolytext.c b/nx-X11/programs/Xserver/mi/mipolytext.c
index c2bbaba38..92a51ac87 100644
--- a/nx-X11/programs/Xserver/mi/mipolytext.c
+++ b/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>
diff --git a/nx-X11/programs/Xserver/mi/misprite.c b/nx-X11/programs/Xserver/mi/misprite.c
index 0ff6dacd6..a5e3f9ccf 100644
--- a/nx-X11/programs/Xserver/mi/misprite.c
+++ b/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"
diff --git a/nx-X11/programs/Xserver/mi/mivaltree.c b/nx-X11/programs/Xserver/mi/mivaltree.c
index d745238b6..b9a42472f 100644
--- a/nx-X11/programs/Xserver/mi/mivaltree.c
+++ b/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"
diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c
index c2a98d422..0dd788ec3 100755
--- a/nx-X11/programs/Xserver/miext/damage/damage.c
+++ b/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>
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index 16343fc9c..b3ef60f22 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/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