1 files changed, 7 insertions, 1 deletions
diff --git a/libX11/src/XlibInt.c b/libX11/src/XlibInt.c
index c385f4cbf..498cf16be 100644
--- a/libX11/src/XlibInt.c
+++ b/libX11/src/XlibInt.c
@@ -33,6 +33,7 @@ from The Open Group.
 
 #ifdef WIN32
 #define _XLIBINT_
+#include <X11\Xw32defs.h>
 #endif
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -198,6 +199,11 @@ void _XPollfdCacheDel(
 #endif
 }
 
+#ifdef _MSC_VER
+#undef min
+#define min __min
+#endif
+
 static int sync_hazard(Display *dpy)
 {
     unsigned long span = dpy->request - dpy->last_request_read;
@@ -239,7 +245,7 @@ void _XSeqSyncFunction(
 static int
 _XPrivSyncFunction (Display *dpy)
 {
-#if XTHREADS
+#ifdef XTHREADS
     assert(!dpy->lock_fns);
 #endif
     assert(dpy->synchandler == _XPrivSyncFunction);