From 433d8186588698ce6a435fbff5e9d40a37b78be9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 8 Jul 2015 16:16:40 +0200
Subject: 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.
---
 nx-X11/lib/Xcomposite/Imakefile       |  2 +-
 nx-X11/lib/Xcomposite/Xcomposite.h    |  6 +++---
 nx-X11/lib/Xcomposite/xcompositeint.h | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'nx-X11/lib/Xcomposite')

diff --git a/nx-X11/lib/Xcomposite/Imakefile b/nx-X11/lib/Xcomposite/Imakefile
index a8e4077fa..24820c146 100644
--- a/nx-X11/lib/Xcomposite/Imakefile
+++ b/nx-X11/lib/Xcomposite/Imakefile
@@ -16,7 +16,7 @@ SOXCOMPOSITEREV=1.0.0
 
 #define LibName NX_Xcomposite
 #define SoRev SOXCOMPOSITEREV
-#define IncSubdir X11
+#define IncSubdir nx-X11
 #define IncSubSubdir extensions
 
 #include <Threads.tmpl>
diff --git a/nx-X11/lib/Xcomposite/Xcomposite.h b/nx-X11/lib/Xcomposite/Xcomposite.h
index 3604141bb..c28cc6857 100644
--- a/nx-X11/lib/Xcomposite/Xcomposite.h
+++ b/nx-X11/lib/Xcomposite/Xcomposite.h
@@ -25,9 +25,9 @@
 #ifndef _XCOMPOSITE_H_
 #define _XCOMPOSITE_H_
 
-#include <X11/extensions/composite.h>
-#include <X11/extensions/Xfixes.h>
-#include <X11/Xfuncproto.h>
+#include <nx-X11/extensions/composite.h>
+#include <nx-X11/extensions/Xfixes.h>
+#include <nx-X11/Xfuncproto.h>
 
 /*
  * This revision number also appears in configure.ac, they have
diff --git a/nx-X11/lib/Xcomposite/xcompositeint.h b/nx-X11/lib/Xcomposite/xcompositeint.h
index af5f57500..7b12e8d55 100644
--- a/nx-X11/lib/Xcomposite/xcompositeint.h
+++ b/nx-X11/lib/Xcomposite/xcompositeint.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 <X11/extensions/compositeproto.h>
-#include <X11/extensions/Xcomposite.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/extensions/compositeproto.h>
+#include <nx-X11/extensions/Xcomposite.h>
 
 typedef struct _XCompositeExtDisplayInfo {
     struct _XCompositeExtDisplayInfo  *next;    /* keep a linked list */
-- 
cgit v1.2.3