1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 4c7dcb712..a39dd6107 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -68,7 +68,7 @@ typedef struct _Visual {
     VisualID		vid;
     short		class;
     short		bitsPerRGBValue;
-    short		ColormapEntries;
+    long		ColormapEntries;
     short		nplanes;/* = log2 (ColormapEntries). This does not
 				 * imply that the screen has this many planes.
 				 * it may have more or fewer */
@@ -445,6 +445,10 @@ typedef    void (* MarkUnrealizedWindowProcPtr)(
 	WindowPtr /*pWin*/,
 	Bool /*fromConfigure*/);
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 typedef    Bool (* DeviceCursorInitializeProcPtr)(
         DeviceIntPtr /* pDev */,
         ScreenPtr    /* pScreen */);