Xnest: drop special hack for Xlib's GC type

Now that the name clash on GC type between Xserver and xlib has been fixed,
there's no need to do the special renaming hack anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

hw/xnest/Display.c

@@ -52,7 +52,7 @@ Pixel xnestWhitePixel;
 Drawable xnestDefaultDrawables[MAXDEPTH + 1];
 Pixmap xnestIconBitmap;
 Pixmap xnestScreenSaverPixmap;
-XlibGC xnestBitmapGC;
+GC xnestBitmapGC;
 unsigned long xnestEventMask;
 
 static int _X_NORETURN

hw/xnest/Display.h

@@ -37,7 +37,7 @@ extern Pixel xnestWhitePixel;
 extern Drawable xnestDefaultDrawables[MAXDEPTH + 1];
 extern Pixmap xnestIconBitmap;
 extern Pixmap xnestScreenSaverPixmap;
-extern XlibGC xnestBitmapGC;
+extern GC xnestBitmapGC;
 extern unsigned long xnestEventMask;
 
 void xnestOpenDisplay(int argc, char *argv[]);

hw/xnest/XNGC.h

@@ -20,10 +20,8 @@ is" without express or implied warranty.
 #include "include/gcstruct.h"
 #include "include/privates.h"
 
-/* This file uses the GC definition form Xlib.h as XlibGC. */
-
 typedef struct {
-    XlibGC gc;
+    GC gc;
 } xnestPrivGC;
 
 extern DevPrivateKeyRec xnestGCPrivateKeyRec;

hw/xnest/Xnest.h

@@ -67,11 +67,9 @@ typedef XID KeySym64;
 #define KeySym          KeySym64
 #endif  /*_XSERVER64*/
 
-#define GC XlibGC
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
-#undef GC
 
 #ifdef _XSERVER64_tmp
 #define _XSERVER64