From 43280372686177603111b175e92e1c88ad4ccdee Mon Sep 17 00:00:00 2001
From: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu, 12 May 2011 01:42:05 +0800
Subject: [PATCH] glamor-ddx: Fix a compiling error. Need revisit.

GC is redefined in the X11/Xlib.h and include/gcstruct.h which is
a xorg header file. Just use a macro to simply avoid the conflict.
Need revisit latter to find a correct way to fix this problem.
---
 hw/xfree86/glamor/glamor.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/xfree86/glamor/glamor.c b/hw/xfree86/glamor/glamor.c
index 61db4ad78..59475288f 100644
--- a/hw/xfree86/glamor/glamor.c
+++ b/hw/xfree86/glamor/glamor.c
@@ -45,7 +45,9 @@
 #include "../../../mi/micmap.h"
 #include <xf86Crtc.h>
 #include <xf86.h>
+#define GC XORG_GC
 #include <glamor.h>
+#undef GC
 
 #include "glamor_ddx.h"