aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-07-26 23:25:26 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-07-26 23:25:26 +0200
commit9a4bb50af54ced8d53112b8fa3b5b9dc3b481224 (patch)
tree9d2ae4aeacaae81dd80c575cf68908cdf51814e7 /nx-X11/programs/Xserver/hw/nxagent
parent470611e02ccb0aba1800da36130dc8824a6862e1 (diff)
downloadnx-libs-9a4bb50af54ced8d53112b8fa3b5b9dc3b481224.tar.gz
nx-libs-9a4bb50af54ced8d53112b8fa3b5b9dc3b481224.tar.bz2
nx-libs-9a4bb50af54ced8d53112b8fa3b5b9dc3b481224.zip
Fix wrong include
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
-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