aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-26 10:11:47 +0100
committermarha <marha@users.sourceforge.net>2012-01-26 10:11:47 +0100
commit71533d7122266586a4490079c4914f44a62d4813 (patch)
tree6e0985cbbeef51b2c0816b8d47076a15187f2e01
parent90885072aaa0c65bb37bdfaa3bd2476daf67cc11 (diff)
downloadvcxsrv-71533d7122266586a4490079c4914f44a62d4813.tar.gz
vcxsrv-71533d7122266586a4490079c4914f44a62d4813.tar.bz2
vcxsrv-71533d7122266586a4490079c4914f44a62d4813.zip
Include Xutil.h for missing defines
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwndproc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index e19f90dcf..d9ada2d65 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -35,6 +35,10 @@
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
+#define GC tempGC // This is to avoid name conflicts when including the next headers which also define GC
+#include <X11/Xutil.h>
+#undef GC
+
#include "win.h"
#include "dixevents.h"
#include "winmultiwindowclass.h"