diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-07-08 16:16:40 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:15:24 +0100 |
| commit | 433d8186588698ce6a435fbff5e9d40a37b78be9 (patch) | |
| tree | 1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11/lib/X11/Xlibint.h | |
| parent | f58006d932d907dc13d76084e9171de59ee27f16 (diff) | |
| download | nx-libs-433d8186588698ce6a435fbff5e9d40a37b78be9.tar.gz nx-libs-433d8186588698ce6a435fbff5e9d40a37b78be9.tar.bz2 nx-libs-433d8186588698ce6a435fbff5e9d40a37b78be9.zip | |
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.
Diffstat (limited to 'nx-X11/lib/X11/Xlibint.h')
| -rw-r--r-- | nx-X11/lib/X11/Xlibint.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index bcd42b52b..854b64b22 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -58,9 +58,9 @@ from The Open Group. * Warning, there be dragons here.... */ -#include <X11/Xlib.h> -#include <X11/Xproto.h> /* to declare xEvent */ -#include <X11/XlibConf.h> /* for configured options like XTHREADS */ +#include <nx-X11/Xlib.h> +#include <nx-X11/Xproto.h> /* to declare xEvent */ +#include <nx-X11/XlibConf.h> /* for configured options like XTHREADS */ #ifdef NX_TRANS_SOCKET @@ -233,14 +233,14 @@ typedef struct _XSQEvent #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #ifdef __sgi #define _SGI_MP_SOURCE /* turn this on to get MP safe errno */ #endif #include <errno.h> #define _XBCOPYFUNC _Xbcopy -#include <X11/Xfuncs.h> -#include <X11/Xosdefs.h> +#include <nx-X11/Xfuncs.h> +#include <nx-X11/Xosdefs.h> /* Utek leaves kernel macros around in include files (bleah) */ #ifdef dirty @@ -250,7 +250,7 @@ typedef struct _XSQEvent #include <stdlib.h> #include <string.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> _XFUNCPROTOBEGIN |