Xnest: drop hackish Xnest.h

Now that Xserver's GC struct has been renamed not to conflict with Xlib
anymore, we can drop the ridiculous include hacks and drop Xnest.h

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

hw/xnest/Args.c

@@ -27,8 +27,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "extinit.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Args.h"
 

hw/xnest/Color.c

@@ -25,8 +25,6 @@ is" without express or implied warranty.
 #include "colormapst.h"
 #include "resource.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Color.h"

hw/xnest/Cursor.c

@@ -25,8 +25,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointrst.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNCursor.h"

hw/xnest/Display.c

@@ -28,8 +28,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Init.h"
 #include "Args.h"
@@ -52,7 +50,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

@@ -15,6 +15,9 @@ is" without express or implied warranty.
 #ifndef XNESTCOMMON_H
 #define XNESTCOMMON_H
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include "colormap.h"
 
 #define UNDEFINED -1
@@ -37,7 +40,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/Events.c

@@ -29,8 +29,6 @@ is" without express or implied warranty.
 #include "inputstr.h"
 #include "inpututils.h"
 
-#include "Xnest.h"
-
 #include "Args.h"
 #include "Color.h"
 #include "Display.h"

hw/xnest/Font.c

@@ -27,8 +27,6 @@ is" without express or implied warranty.
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "XNFont.h"
 

hw/xnest/GC.c

@@ -25,8 +25,6 @@ is" without express or implied warranty.
 #include "mistruct.h"
 #include "region.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "XNGC.h"
 #include "GCOps.h"

hw/xnest/GCOps.c

@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "region.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNGC.h"

hw/xnest/Handlers.c

@@ -22,8 +22,6 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Events.h"
 #include "Handlers.h"

hw/xnest/Init.c

@@ -33,7 +33,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "dixfontstr.h"
 #include "extinit_priv.h"
-#include "Xnest.h"
 
 #include "Display.h"
 #include "Screen.h"

hw/xnest/Keyboard.c

@@ -28,8 +28,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Keyboard.h"

hw/xnest/Pixmap.c

@@ -25,8 +25,6 @@ is" without express or implied warranty.
 #include "privates.h"
 #include "mi.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNPixmap.h"

hw/xnest/Pointer.c

@@ -23,8 +23,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointer.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Pointer.h"

hw/xnest/Screen.c

@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "colormapst.h"
 #include "resource.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNGC.h"

hw/xnest/Visual.c

@@ -15,10 +15,10 @@ is" without express or implied warranty.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
 #include "scrnintstr.h"
 #include "dix.h"
 #include "mi.h"
-#include "Xnest.h"
 
 #include "Display.h"
 #include "Visual.h"

hw/xnest/Window.c

@@ -16,6 +16,7 @@ is" without express or implied warranty.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/shape.h>
 
 #include "mi/mi_priv.h"
 
@@ -27,8 +28,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "region.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNGC.h"

hw/xnest/XNGC.h

@@ -23,7 +23,7 @@ is" without express or implied warranty.
 /* 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

@@ -1,39 +0,0 @@
-/*
-
-Copyright (c) 1995  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-*/
-#ifndef _XORG_XNEST_H
-#define _XORG_XNEST_H
-
-#define GC XlibGC
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/shape.h>
-#undef GC
-
-#endif /* _XORG_XNEST_H */