1 files changed, 85 insertions, 0 deletions
diff --git a/vcpkg/ports/xproto/windows-none.patch b/vcpkg/ports/xproto/windows-none.patch
new file mode 100644
index 0000000..87764c8
--- /dev/null
+++ b/vcpkg/ports/xproto/windows-none.patch
@@ -0,0 +1,85 @@
+diff --git a/include/X11/Xwindows.h b/include/X11/Xwindows.h
+index 70e1debd5..236ec96a7 100644
+--- a/include/X11/Xwindows.h
++++ b/include/X11/Xwindows.h
+@@ -69,6 +69,16 @@ The Open Group.
+ #endif
+ #undef Status
+ #define Status wStatus
++#ifdef None // FS.h defines None which is used in winnt.h
++#pragma push_macro("None")
++#define NoneDefined
++#undef None
++#endif
++#ifdef ControlMask // X.h defines ControlMask which is used in processthreadapi.h
++#pragma push_macro("ControlMask")
++#define ControlMaskDefined
++#undef ControlMask
++#endif
+ #define ATOM wATOM
+ #define BYTE wBYTE
+ #define FreeResource wFreeResource
+@@ -76,6 +77,14 @@ The Open Group.
+ #undef NOMINMAX
+ #undef Status
+-#define Status int
++typedef int Status;
++#ifdef NoneDefined
++#pragma pop_macro("None")
++#undef NoneDefined
++#endif
++#ifdef ControlMaskDefined
++#pragma pop_macro("ControlMask")
++#undef ControlMaskDefined
++#endif
+ #undef BYTE
+ #undef BOOL
+ #undef INT32
+diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h
+index 624047d..e8d5653 100644
+--- a/include/X11/Xwinsock.h
++++ b/include/X11/Xwinsock.h
+@@ -47,23 +47,42 @@ The Open Group.
+ #define _NO_BOOL_TYPEDEF
+ #define BOOL WINBOOL
+ #define INT32 wINT32
+ #ifdef __x86_64__
+ #define INT64 wINT64
+ #define LONG64 wLONG64
+ #endif
+ #undef Status
+ #define Status wStatus
++#ifdef None
++#pragma push_macro("None")
++#define NoneDefined
++#undef None
++#endif
++#ifdef ControlMask
++#pragma push_macro("ControlMask")
++#define ControlMaskDefined
++#undef ControlMask
++#endif
+ #define ATOM wATOM
+ #define BYTE wBYTE
+ #define FreeResource wFreeResource
+ #include <winsock2.h>
++#include <ws2tcpip.h>
+ #undef Status
+-#define Status int
++typedef int Status;
++#ifdef NoneDefined
++#pragma pop_macro("None")
++#undef NoneDefined
++#endif
++#ifdef ControlMaskDefined
++#pragma pop_macro("ControlMask")
++#undef ControlMaskDefined
++#endif
+ #undef BYTE
+ #undef BOOL
+ #undef INT32
+ #undef INT64
+ #undef LONG64
+ #undef ATOM
+ #undef FreeResource
+ #undef CreateWindowA