mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 06:29: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>
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
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,6 +47,10 @@ 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
|
|
#define ATOM wATOM
|
|
@@ -58,6 +62,8 @@ The Open Group.
|
|
#undef BYTE
|
|
#undef BOOL
|
|
#undef INT32
|
|
+#undef INT64
|
|
+#undef LONG64
|
|
#undef ATOM
|
|
#undef FreeResource
|
|
#undef CreateWindowA
|
|
diff --git a/include/X11/meson.build b/include/X11/meson.build
|
|
index 1c33c64..703ab19 100644
|
|
--- a/include/X11/meson.build
|
|
+++ b/include/X11/meson.build
|
|
@@ -1,7 +1,8 @@
|
|
fd_set_maybe_headers = [ 'sys/param.h',
|
|
'sys/types.h',
|
|
'sys/time.h',
|
|
- 'sys/select.h'
|
|
+ 'sys/select.h',
|
|
+ 'winsock2.h'
|
|
]
|
|
fd_set_headers = ''
|
|
foreach h : fd_set_maybe_headers
|
|
@@ -15,6 +16,8 @@ if cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers)
|
|
fds_bits = 'fds_bits'
|
|
elif cc.has_member('fd_set', '__fds_bits', prefix: fd_set_headers)
|
|
fds_bits = '__fds_bits'
|
|
+elif cc.has_member('fd_set', 'fd_count', prefix: fd_set_headers)
|
|
+ fds_bits = 'fd_count'
|
|
else
|
|
error('Your fd_set is too weird.')
|
|
endif
|
|
--
|