aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-27 13:05:27 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-27 13:05:27 +0200
commite1c85caacca67ea3d25319f2fe0a2985845bf1e9 (patch)
tree9d2ae4aeacaae81dd80c575cf68908cdf51814e7 /nx-X11/programs/Xserver
parent470611e02ccb0aba1800da36130dc8824a6862e1 (diff)
parent9a4bb50af54ced8d53112b8fa3b5b9dc3b481224 (diff)
downloadnx-libs-e1c85caacca67ea3d25319f2fe0a2985845bf1e9.tar.gz
nx-libs-e1c85caacca67ea3d25319f2fe0a2985845bf1e9.tar.bz2
nx-libs-e1c85caacca67ea3d25319f2fe0a2985845bf1e9.zip
Merge branch 'uli42-3.6.x' into 3.6.x
Attributes GH PR #189: https://github.com/ArcticaProject/nx-libs/pull/189
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Agent.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
index 8577865a2..e74f15777 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
@@ -112,6 +112,13 @@ 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