aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/Xfixes
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/Xfixes
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/Xfixes')
-rw-r--r--nx-X11/lib/Xfixes/Imakefile2
-rw-r--r--nx-X11/lib/Xfixes/Xfixes.h4
-rw-r--r--nx-X11/lib/Xfixes/Xfixes.man2
-rw-r--r--nx-X11/lib/Xfixes/Xfixesint.h8
4 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/lib/Xfixes/Imakefile b/nx-X11/lib/Xfixes/Imakefile
index ca1fe046b..cc3e1631d 100644
--- a/nx-X11/lib/Xfixes/Imakefile
+++ b/nx-X11/lib/Xfixes/Imakefile
@@ -16,7 +16,7 @@ SOXFIXESREV=3.0.0
#define LibName NX_Xfixes
#define SoRev SOXFIXESREV
-#define IncSubdir X11
+#define IncSubdir nx-X11
#define IncSubSubdir extensions
#include <Threads.tmpl>
diff --git a/nx-X11/lib/Xfixes/Xfixes.h b/nx-X11/lib/Xfixes/Xfixes.h
index 28ca28f1a..4cba47ca4 100644
--- a/nx-X11/lib/Xfixes/Xfixes.h
+++ b/nx-X11/lib/Xfixes/Xfixes.h
@@ -25,9 +25,9 @@
#ifndef _XFIXES_H_
#define _XFIXES_H_
-#include <X11/extensions/xfixeswire.h>
+#include <nx-X11/extensions/xfixeswire.h>
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
/*
* This revision number also appears in configure.ac, they have
diff --git a/nx-X11/lib/Xfixes/Xfixes.man b/nx-X11/lib/Xfixes/Xfixes.man
index f081cc54e..563db15b5 100644
--- a/nx-X11/lib/Xfixes/Xfixes.man
+++ b/nx-X11/lib/Xfixes/Xfixes.man
@@ -31,7 +31,7 @@
.SH NAME
XFixes \- Augmented versions of core protocol requests
.SH SYNTAX
-\&#include <X11/extensions/Xfixes.h>
+\&#include <nx-X11/extensions/Xfixes.h>
.nf
.sp
Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP,
diff --git a/nx-X11/lib/Xfixes/Xfixesint.h b/nx-X11/lib/Xfixes/Xfixesint.h
index e227571be..353dcae77 100644
--- a/nx-X11/lib/Xfixes/Xfixesint.h
+++ b/nx-X11/lib/Xfixes/Xfixesint.h
@@ -28,11 +28,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
#include "Xfixes.h"
-#include <X11/extensions/xfixesproto.h>
+#include <nx-X11/extensions/xfixesproto.h>
extern char XFixesExtensionName[];