aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/scrnintstr.h
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/include/scrnintstr.h')
-rw-r--r--xorg-server/include/scrnintstr.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 86da78966..3dc499e7f 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -66,7 +66,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 */
@@ -332,6 +332,10 @@ typedef void (*MarkUnrealizedWindowProcPtr) (WindowPtr /*pChild */ ,
WindowPtr /*pWin */ ,
Bool /*fromConfigure */ );
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
typedef Bool (*DeviceCursorInitializeProcPtr) (DeviceIntPtr /* pDev */ ,
ScreenPtr /* pScreen */ );