8 files changed, 15 insertions, 15 deletions
diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h
index d44b9cfa7..88d1df342 100644
--- a/xorg-server/include/dixstruct.h
+++ b/xorg-server/include/dixstruct.h
@@ -97,7 +97,7 @@ typedef struct _Client {
     Bool        swapped;
     ReplySwapPtr pSwapReplyFunc;
     XID         errorValue;
-    int         sequence;
+    unsigned short sequence;    //MH
     int         closeDownMode;
     int         clientGone;
     int         noClientException;	/* this client died or needs to be
diff --git a/xorg-server/include/do-not-use-config.h b/xorg-server/include/do-not-use-config.h
index b2c9161ee..ddec02eee 100644
--- a/xorg-server/include/do-not-use-config.h
+++ b/xorg-server/include/do-not-use-config.h
@@ -643,10 +643,10 @@
 #define XKB 1
 
 /* Path to XKB data */
-#define XKB_BASE_DIRECTORY "/usr/local/share/X11/xkb"
+#define XKB_BASE_DIRECTORY "xkbdata"
 
 /* Path to XKB bin dir */
-#define XKB_BIN_DIRECTORY "/usr/local/bin"
+#define XKB_BIN_DIRECTORY "."
 
 /* Disable XKB per default */
 #define XKB_DFLT_DISABLED 0
@@ -655,7 +655,7 @@
 #define XKB_IN_SERVER 1
 
 /* Path to XKB output dir */
-#define XKM_OUTPUT_DIR "/usr/local/share/X11/xkb/compiled/"
+#define XKM_OUTPUT_DIR "xkbdata/compiled/"
 
 /* Building Xorg server */
 #define XORGSERVER 1
diff --git a/xorg-server/include/globals.h b/xorg-server/include/globals.h
index 2ca9531d9..1ff701380 100644
--- a/xorg-server/include/globals.h
+++ b/xorg-server/include/globals.h
@@ -50,9 +50,7 @@ extern Bool PanoramiXExtensionDisabledHack;
 extern Bool noBigReqExtension;
 #endif
 
-#ifdef COMPOSITE
 extern Bool noCompositeExtension;
-#endif
 
 #ifdef DAMAGE
 extern Bool noDamageExtension;
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index a1cbe8670..ca740c08b 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -164,9 +164,9 @@ typedef struct _xReq *xReqPtr;
 
 #include <math.h>
 #undef MAXSHORT
-#define MAXSHORT SHRT_MAX
+#define MAXSHORT 32767
 #undef MINSHORT
-#define MINSHORT SHRT_MIN
+#define MINSHORT -32768
 #undef MAXINT
 #define MAXINT INT_MAX
 #undef MININT
diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h
index cc5a8d8de..4150b69b7 100644
--- a/xorg-server/include/pixmapstr.h
+++ b/xorg-server/include/pixmapstr.h
@@ -76,10 +76,8 @@ typedef struct _Pixmap {
     int			refcnt;
     int			devKind;
     DevUnion		devPrivate;
-#ifdef COMPOSITE
     short		screen_x;
     short		screen_y;
-#endif
     unsigned		usage_hint; /* see CREATE_PIXMAP_USAGE_* */
 } PixmapRec;
 
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 3b2cf9f81..c49487585 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 */
@@ -432,6 +432,10 @@ typedef    void (* MarkUnrealizedWindowProcPtr)(
 	WindowPtr /*pWin*/,
 	Bool /*fromConfigure*/);
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 typedef struct _Screen {
     int			myNum;	/* index of this instance in Screens[] */
     ATOM		id;
diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index e06a2f1bd..f370a25d2 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.h
@@ -137,7 +137,7 @@ typedef struct _Window {
     RegionRec		borderSize;
     DDXPointRec		origin;		/* position relative to parent */
     unsigned short	borderWidth;
-    unsigned short	deliverableEvents;
+    unsigned long	deliverableEvents;
     Mask		eventMask;
     PixUnion		background;
     PixUnion		border;
diff --git a/xorg-server/include/xkb-config.h b/xorg-server/include/xkb-config.h
index 8dc80b6c5..91c7957bf 100644
--- a/xorg-server/include/xkb-config.h
+++ b/xorg-server/include/xkb-config.h
@@ -10,13 +10,13 @@
 #define __XKBDEFRULES__ "xorg"
 
 /* Path to XKB definitions. */
-#define XKB_BASE_DIRECTORY "/usr/local/share/X11/xkb"
+#define XKB_BASE_DIRECTORY "xkbdata"
 
 /* Path to xkbcomp. */
-#define XKB_BIN_DIRECTORY "/usr/local/bin"
+#define XKB_BIN_DIRECTORY "."
 
 /* XKB output dir for compiled keymaps. */
-#define XKM_OUTPUT_DIR "/usr/local/share/X11/xkb/compiled/"
+#define XKM_OUTPUT_DIR "xkbdata/compiled/"
 
 /* Do not have `strcasecmp'. */
 /* #undef NEED_STRCASECMP */