From 35e8c02d9c64e6d15e33dfee1f13c6cb94d4108b Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 24 Sep 2016 23:41:55 +0200
Subject: ensure that <X11/..> headers references use nx-X11 files if existing

System headers including other headers via <X11/..> now use the
nx-X11 variant (if existing).

With this patch in place we should think about dropping the
<nx-X11/..> namespace now for includes.

Fixes ArcticaProject/nx-libs#200.
---
 nx-X11/include/Imakefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'nx-X11')

diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile
index 7e05f4354..8a05f9720 100644
--- a/nx-X11/include/Imakefile
+++ b/nx-X11/include/Imakefile
@@ -56,6 +56,12 @@ all::
 
 BuildIncludes($(HEADERS),nx-X11,..)
 
+includes::
+	-$(RM) $(BUILDINCDIR)/X11
+	-$(LN) nx-X11 $(BUILDINCDIR)/X11
+
+
+
 #if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS))
 #endif
-- 
cgit v1.2.3


From c061022a9f4d6b53f8f14e3265699a0c53b3f046 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 24 Sep 2016 23:43:01 +0200
Subject: whitespace cleanup

---
 nx-X11/include/Imakefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'nx-X11')

diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile
index 8a05f9720..8b5bd356f 100644
--- a/nx-X11/include/Imakefile
+++ b/nx-X11/include/Imakefile
@@ -1,8 +1,4 @@
 XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $
-
-
-
-
 XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
 
 NULL =
@@ -60,8 +56,6 @@ includes::
 	-$(RM) $(BUILDINCDIR)/X11
 	-$(LN) nx-X11 $(BUILDINCDIR)/X11
 
-
-
 #if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS))
 #endif
@@ -83,7 +77,7 @@ InstallDriverSDKNonExecFile(keysym.h,$(DRIVERSDKINCLUDEDIR))
 
 /* _XOPEN_SOURCE is defined where needed to move __fds_bits to fds_bits. */
 USE_FDS_BITS = fds_bits
-	
+
 Xpoll.h: Xpoll.h.in
 	sed -e "s/@USE_FDS_BITS@/$(USE_FDS_BITS)/;" < Xpoll.h.in > Xpoll.h
 
-- 
cgit v1.2.3


From 97a5cec70b176956b36c5f76e9c741b60ff9ba59 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 24 Sep 2016 23:44:09 +0200
Subject: Revert "Fix wrong include"

After commit cbf3ef0f219a7d5c94a7f5d5b46c9a0e26cc6588 this no longer
necessary.

This reverts commit 9a4bb50af54ced8d53112b8fa3b5b9dc3b481224.
---
 nx-X11/programs/Xserver/hw/nxagent/Agent.h | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'nx-X11')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
index e74f15777..8577865a2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
@@ -112,13 +112,6 @@ typedef XID KeySym64;
 #define NX_TRANS_SOCKET
 #define GC XlibGC
 #include <nx-X11/Xlib.h>
-/*
-  <X11/extension/shape.h> includes <X11/Xutil.h> but we need
-  <nx-X11/Xutil.h>. As both use the same header guard we can first
-  include <nx-X11/Xutil.h> and be ok.
-*/
-#include <nx-X11/Xutil.h>
-
 #include <X11/extensions/shape.h>
 #undef GC
 
-- 
cgit v1.2.3