From 71533d7122266586a4490079c4914f44a62d4813 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 26 Jan 2012 10:11:47 +0100
Subject: Include Xutil.h for missing defines

---
 xorg-server/hw/xwin/winmultiwindowwndproc.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'xorg-server')

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"
-- 
cgit v1.2.3