mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 05:52:27 +08:00
552f1ee5f8
* first batch of xwindow PR ports - up to dbus * first batch of xwindow PR ports - up to dbus * format manifest * version stuff * remove if block * version stuff * fix xcb hash * fix xproto dependency on meson blocking cross builds * adjust message * use X11_xcb_LIB * version stuff * put xlib arm64-windows on baseline * fix dbus on osx and linux * version stuff * forget to set the value * fix --export-dynamic on osx * version dbus * ci-retrigger * add license (needs tool update) * version adjustments * version update * remove unnecessary comments * v db * Apply suggestions from code review Co-authored-by: Billy O'Neal <bion@microsoft.com> * nitpicks * rename xau to libxau * use vcpkg_install_copyright and silence usage * xtrans silence usage * format-manifest * v db * make license null for ports without exact match * xdmcp rename to libxdmcp * merge x11 wrapper into xlib rename xlib to libx11 to avoid a metaport * v db * missed dbus depending on x11. * v db * Update scripts/ci.baseline.txt Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Alexander Neumann <you@example.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Billy O'Neal <bion@microsoft.com>
86 lines
2.0 KiB
Diff
86 lines
2.0 KiB
Diff
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
|