aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext/extmod
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-07-08 16:16:40 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:15:24 +0100
commit433d8186588698ce6a435fbff5e9d40a37b78be9 (patch)
tree1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11/programs/Xserver/Xext/extmod
parentf58006d932d907dc13d76084e9171de59ee27f16 (diff)
downloadnx-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/programs/Xserver/Xext/extmod')
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.h40
2 files changed, 21 insertions, 21 deletions
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c
index f79204281..162f76ad8 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c
+++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.c
@@ -33,7 +33,7 @@
#include "xf86Module.h"
#include "xf86Opt.h"
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
#include "modinit.h"
#include "globals.h"
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
index 2bafdb2b0..40e1828bb 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
@@ -12,26 +12,26 @@
#ifdef SHAPE
extern void ShapeExtensionInit(INITARGS);
#define _SHAPE_SERVER_ /* don't want Xlib structures */
-#include <X11/extensions/shapestr.h>
+#include <nx-X11/extensions/shapestr.h>
#endif
#ifdef MULTIBUFFER
extern void MultibufferExtensionInit(INITARGS);
#define _MULTIBUF_SERVER_ /* don't want Xlib structures */
-#include <X11/extensions/multibufst.h>
+#include <nx-X11/extensions/multibufst.h>
#endif
#ifdef MITMISC
extern void MITMiscExtensionInit(INITARGS);
#define _MITMISC_SERVER_
-#include <X11/extensions/mitmiscstr.h>
+#include <nx-X11/extensions/mitmiscstr.h>
#endif
#ifdef XTEST
extern void XTestExtensionInit(INITARGS);
#define _XTEST_SERVER_
-#include <X11/extensions/XTest.h>
-#include <X11/extensions/xteststr.h>
+#include <nx-X11/extensions/XTest.h>
+#include <nx-X11/extensions/xteststr.h>
#endif
#if 1
@@ -40,49 +40,49 @@ extern void XTestExtension1Init(INITARGS);
#ifdef BIGREQS
extern void BigReqExtensionInit(INITARGS);
-#include <X11/extensions/bigreqstr.h>
+#include <nx-X11/extensions/bigreqstr.h>
#endif
#ifdef XSYNC
extern void SyncExtensionInit(INITARGS);
#define _SYNC_SERVER
-#include <X11/extensions/sync.h>
-#include <X11/extensions/syncstr.h>
+#include <nx-X11/extensions/sync.h>
+#include <nx-X11/extensions/syncstr.h>
#endif
#ifdef SCREENSAVER
extern void ScreenSaverExtensionInit (INITARGS);
-#include <X11/extensions/saver.h>
+#include <nx-X11/extensions/saver.h>
#endif
#ifdef XCMISC
extern void XCMiscExtensionInit(INITARGS);
-#include <X11/extensions/xcmiscstr.h>
+#include <nx-X11/extensions/xcmiscstr.h>
#endif
#ifdef XF86VIDMODE
extern void XFree86VidModeExtensionInit(INITARGS);
#define _XF86VIDMODE_SERVER_
-#include <X11/extensions/xf86vmstr.h>
+#include <nx-X11/extensions/xf86vmstr.h>
#endif
#ifdef XF86MISC
extern void XFree86MiscExtensionInit(INITARGS);
#define _XF86MISC_SERVER_
#define _XF86MISC_SAVER_COMPAT_
-#include <X11/extensions/xf86mscstr.h>
+#include <nx-X11/extensions/xf86mscstr.h>
#endif
#ifdef XFreeXDGA
extern void XFree86DGAExtensionInit(INITARGS);
extern void XFree86DGARegister(INITARGS);
#define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dgastr.h>
+#include <nx-X11/extensions/xf86dgastr.h>
#endif
#ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS);
-#include <X11/extensions/dpmsstr.h>
+#include <nx-X11/extensions/dpmsstr.h>
#endif
#ifdef FONTCACHE
@@ -95,31 +95,31 @@ extern void FontCacheExtensionInit(INITARGS);
#ifdef TOGCUP
extern void XcupExtensionInit(INITARGS);
#define _XCUP_SERVER_
-#include <X11/extensions/Xcupstr.h>
+#include <nx-X11/extensions/Xcupstr.h>
#endif
#ifdef EVI
extern void EVIExtensionInit(INITARGS);
#define _XEVI_SERVER_
-#include <X11/extensions/XEVIstr.h>
+#include <nx-X11/extensions/XEVIstr.h>
#endif
#ifdef XV
extern void XvExtensionInit(INITARGS);
extern void XvMCExtensionInit(INITARGS);
extern void XvRegister(INITARGS);
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/XvMC.h>
+#include <nx-X11/extensions/Xv.h>
+#include <nx-X11/extensions/XvMC.h>
#endif
#ifdef RES
extern void ResExtensionInit(INITARGS);
-#include <X11/extensions/XResproto.h>
+#include <nx-X11/extensions/XResproto.h>
#endif
#ifdef SHM
extern void ShmExtensionInit(INITARGS);
-#include <X11/extensions/shmstr.h>
+#include <nx-X11/extensions/shmstr.h>
extern void ShmSetPixmapFormat(
ScreenPtr pScreen,
int format);