aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/Xrender
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/lib/Xrender
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/lib/Xrender')
-rw-r--r--nx-X11/lib/Xrender/Imakefile2
-rw-r--r--nx-X11/lib/Xrender/Picture.c2
-rw-r--r--nx-X11/lib/Xrender/Xrender.h10
-rw-r--r--nx-X11/lib/Xrender/Xrenderint.h6
4 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/lib/Xrender/Imakefile b/nx-X11/lib/Xrender/Imakefile
index 35d826b22..c5a0f89fc 100644
--- a/nx-X11/lib/Xrender/Imakefile
+++ b/nx-X11/lib/Xrender/Imakefile
@@ -71,7 +71,7 @@ clean::
#define SoRev SOXRENDERREV
#ifdef XBuildIncDir
-#define IncSubdir X11
+#define IncSubdir nx-X11
#define IncSubSubdir extensions
RENDERINCDIR = $(BUILDINCDIR)
#else
diff --git a/nx-X11/lib/Xrender/Picture.c b/nx-X11/lib/Xrender/Picture.c
index 0b18f5c57..260eda05e 100644
--- a/nx-X11/lib/Xrender/Picture.c
+++ b/nx-X11/lib/Xrender/Picture.c
@@ -26,7 +26,7 @@
#include <config.h>
#endif
#include "Xrenderint.h"
-#include <X11/Xregion.h>
+#include <nx-X11/Xregion.h>
static void
_XRenderProcessPictureAttributes (Display *dpy,
diff --git a/nx-X11/lib/Xrender/Xrender.h b/nx-X11/lib/Xrender/Xrender.h
index 4d125cd81..a38f4cc3d 100644
--- a/nx-X11/lib/Xrender/Xrender.h
+++ b/nx-X11/lib/Xrender/Xrender.h
@@ -27,12 +27,12 @@
#define NX_CLEANUP
-#include <X11/extensions/render.h>
+#include <nx-X11/extensions/render.h>
-#include <X11/Xlib.h>
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xosdefs.h>
+#include <nx-X11/Xutil.h>
#ifdef NX_CLEANUP
#include "renderproto.h"
diff --git a/nx-X11/lib/Xrender/Xrenderint.h b/nx-X11/lib/Xrender/Xrenderint.h
index a90fe65d8..9744b0da4 100644
--- a/nx-X11/lib/Xrender/Xrenderint.h
+++ b/nx-X11/lib/Xrender/Xrenderint.h
@@ -28,9 +28,9 @@
#include "config.h"
#define NEED_EVENTS
#define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/renderproto.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/extensions/renderproto.h>
#include "Xrender.h"
typedef struct {