11 files changed, 47 insertions, 13 deletions
diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h
index 4bfe3713c..3eac3d110 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/globals.h b/xorg-server/include/globals.h
index c3d2dcfa2..74b09e71d 100644
--- a/xorg-server/include/globals.h
+++ b/xorg-server/include/globals.h
@@ -46,9 +46,7 @@ extern Bool DPMSCapableFlag;
 extern Bool PanoramiXExtensionDisabledHack;
 #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 85f9e5d4f..f56c2c609 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -169,9 +169,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/os.h b/xorg-server/include/os.h
index 77e94486a..59f26898f 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -524,4 +524,8 @@ extern void LogPrintMarkers(void);
 
 extern void xorg_backtrace(void);
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
 #endif /* OS_H */
diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h
index 702faf0ac..8002b170a 100644
--- a/xorg-server/include/pixmapstr.h
+++ b/xorg-server/include/pixmapstr.h
@@ -76,10 +76,8 @@ typedef struct _Pixmap {
     int			refcnt;
     int			devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */
     DevUnion		devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */
-#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 a309077ce..d2d4a659f 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 */
@@ -438,6 +438,10 @@ typedef    void (* MarkUnrealizedWindowProcPtr)(
 	WindowPtr /*pWin*/,
 	Bool /*fromConfigure*/);
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 typedef    Bool (* DeviceCursorInitializeProcPtr)(
         DeviceIntPtr /* pDev */,
         ScreenPtr    /* pScreen */);
diff --git a/xorg-server/include/servermd.h b/xorg-server/include/servermd.h
index dec9f3b9e..8cc20f000 100644
--- a/xorg-server/include/servermd.h
+++ b/xorg-server/include/servermd.h
@@ -269,6 +269,12 @@ SOFTWARE.
 #define GLYPHPADBYTES		4
 #endif /* linux/s390 */ 
 
+#ifdef WIN32
+#define IMAGE_BYTE_ORDER	LSBFirst
+#define BITMAP_BIT_ORDER	LSBFirst
+#define GLYPHPADBYTES		4
+#endif
+
 /* size of buffer to use with GetImage, measured in bytes. There's obviously
  * a trade-off between the amount of heap used and the number of times the
  * ddx routine has to be called.
diff --git a/xorg-server/include/site.h b/xorg-server/include/site.h
index fec87070b..56c802d07 100644
--- a/xorg-server/include/site.h
+++ b/xorg-server/include/site.h
@@ -52,7 +52,7 @@ SOFTWARE.
  * server executable.
  */
 #ifndef VENDOR_STRING
-#define VENDOR_STRING "The X.Org Foundation"
+#define VENDOR_STRING "HMCA"
 #endif
 
 /*
@@ -61,7 +61,7 @@ SOFTWARE.
  * by the vendor.
  */
 #ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE	6600
+#define VENDOR_RELEASE	XORG_VERSION_CURRENT
 #endif
 
 /*
diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index a31fdc1df..e7f4691d9 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.h
@@ -162,7 +162,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
new file mode 100644
index 000000000..91c7957bf
--- /dev/null
+++ b/xorg-server/include/xkb-config.h
@@ -0,0 +1,24 @@
+/* include/xkb-config.h.  Generated from xkb-config.h.in by configure.  */
+/* xkb-config.h.in: not at all generated.                      -*- c -*-
+ * 
+ */
+
+#ifndef _XKB_CONFIG_H_
+#define _XKB_CONFIG_H_
+
+/* Default set of XKB rules. */
+#define __XKBDEFRULES__ "xorg"
+
+/* Path to XKB definitions. */
+#define XKB_BASE_DIRECTORY "xkbdata"
+
+/* Path to xkbcomp. */
+#define XKB_BIN_DIRECTORY "."
+
+/* XKB output dir for compiled keymaps. */
+#define XKM_OUTPUT_DIR "xkbdata/compiled/"
+
+/* Do not have `strcasecmp'. */
+/* #undef NEED_STRCASECMP */
+
+#endif /* _XKB_CONFIG_H_ */
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h
index d43755e06..03bf1fb03 100644
--- a/xorg-server/include/xkbsrv.h
+++ b/xorg-server/include/xkbsrv.h
@@ -293,8 +293,8 @@ extern int	XkbReqCode;
 extern int	XkbEventBase;
 extern int	XkbDisableLockActions;
 extern int	XkbKeyboardErrorCode;
-extern char *	XkbBaseDirectory;
-extern char *	XkbBinDirectory;
+extern const char *	XkbBaseDirectory;
+extern const char *	XkbBinDirectory;
 extern char *	XkbInitialMap;
 extern unsigned	int XkbXIUnsupported;