mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 05:49:01 +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>
59 lines
1.3 KiB
Diff
59 lines
1.3 KiB
Diff
diff --git a/Xtrans.h b/Xtrans.h
|
|
index fbf385e01..e52e7cba2 100644
|
|
--- a/Xtrans.h
|
|
+++ b/Xtrans.h
|
|
@@ -50,6 +50,10 @@ from The Open Group.
|
|
#ifndef _XTRANS_H_
|
|
#define _XTRANS_H_
|
|
|
|
+#if defined(_WIN32) && !defined(WIN32)
|
|
+# define WIN32 _WIN32
|
|
+#endif
|
|
+
|
|
#include <X11/Xfuncproto.h>
|
|
#include <X11/Xos.h>
|
|
#include <X11/Xmd.h>
|
|
diff --git a/Xtransint.h b/Xtransint.h
|
|
index 2156bd52f..735b54301 100644
|
|
--- a/Xtransint.h
|
|
+++ b/Xtransint.h
|
|
@@ -72,7 +72,7 @@ from The Open Group.
|
|
# define XTRANSDEBUG 1
|
|
#endif
|
|
|
|
-#ifdef WIN32
|
|
+#if defined(WIN32) || defined(_WIN32)
|
|
# define _WILLWINSOCK_
|
|
#endif
|
|
|
|
diff --git a/Xtranssock.c b/Xtranssock.c
|
|
index c29390eaa..f2ef365cc 100644
|
|
--- a/Xtranssock.c
|
|
+++ b/Xtranssock.c
|
|
@@ -74,6 +74,10 @@ from the copyright holders.
|
|
#include <X11/Xthreads.h>
|
|
#endif
|
|
|
|
+#if defined(_WIN32) && !defined(WIN32)
|
|
+# define WIN32 _WIN32
|
|
+#endif
|
|
+
|
|
#ifndef WIN32
|
|
|
|
#if defined(TCPCONN) || defined(UNIXCONN)
|
|
diff --git a/Xtransutil.c b/Xtransutil.c
|
|
index f15be243c..cc67315e6 100644
|
|
--- a/Xtransutil.c
|
|
+++ b/Xtransutil.c
|
|
@@ -54,6 +54,10 @@ from The Open Group.
|
|
* the internal implementation.
|
|
*/
|
|
|
|
+#if defined(_WIN32) && !defined(WIN32)
|
|
+# define WIN32 _WIN32
|
|
+#endif
|
|
+
|
|
#ifdef XTHREADS
|
|
#include <X11/Xthreads.h>
|
|
#endif
|