summaryrefslogtreecommitdiff
path: root/include/X11/Xwinsock.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/X11/Xwinsock.h')
-rw-r--r--include/X11/Xwinsock.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h
index 624047d..722a3cd 100644
--- a/include/X11/Xwinsock.h
+++ b/include/X11/Xwinsock.h
@@ -52,6 +52,8 @@ The Open Group.
#define ATOM wATOM
#define BYTE wBYTE
#define FreeResource wFreeResource
+#pragma push_macro ("ControlMask")
+#undef ControlMask
#include <winsock2.h>
#undef Status
#define Status int
@@ -60,6 +62,7 @@ The Open Group.
#undef INT32
#undef ATOM
#undef FreeResource
+#pragma pop_macro ("ControlMask")
#undef CreateWindowA
#undef RT_FONT
#undef RT_CURSOR