Skip to content

N
nx-libs
Unverified Commit e1c85caa authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'uli42-3.6.x' into 3.6.x

Attributes GH PR #189: https://github.com/ArcticaProject/nx-libs/pull/189
parents 470611e0 9a4bb50a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
nx-X11/programs/Xserver/hw/nxagent/Agent.h
View file @ e1c85caa
...@@ -112,6 +112,13 @@ typedef XID KeySym64; ...@@ -112,6 +112,13 @@ typedef XID KeySym64;
#define NX_TRANS_SOCKET #define NX_TRANS_SOCKET
#define GC XlibGC #define GC XlibGC
#include <nx-X11/Xlib.h> #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> #include <X11/extensions/shape.h>
#undef GC #undef GC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment