mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-06 02:16: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>
42 lines
1.0 KiB
Diff
42 lines
1.0 KiB
Diff
diff --git a/include/X11/Xwindows.h b/include/X11/Xwindows.h
|
|
index 900257928..666ee6515 100644
|
|
--- a/include/X11/Xwindows.h
|
|
+++ b/include/X11/Xwindows.h
|
|
@@ -41,6 +41,11 @@ The Open Group.
|
|
* do as it's no help at all to X11 clients which also need to use the
|
|
* Win32 API)
|
|
*/
|
|
+#pragma once
|
|
+
|
|
+#ifndef _X11_XWINDOWS_H_
|
|
+#define _X11_XWINDOWS_H_
|
|
+
|
|
#undef _XFree86Server
|
|
#ifdef XFree86Server
|
|
# define _XFree86Server
|
|
@@ -130,3 +135,4 @@ typedef int Status;
|
|
# undef _XFree86Server
|
|
#endif
|
|
|
|
+#endif
|
|
diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h
|
|
index 92e0d2a33..1e3e8671b 100644
|
|
--- a/include/X11/Xwinsock.h
|
|
+++ b/include/X11/Xwinsock.h
|
|
@@ -32,6 +32,10 @@ The Open Group.
|
|
* Conflicts come from the fact that including winsock.h actually pulls
|
|
* in the whole Windows API...
|
|
*/
|
|
+#pragma once
|
|
+
|
|
+#ifndef _X11_XWINSOCK_H_
|
|
+#define _X11_XWINSOCK_H_
|
|
|
|
#undef _XFree86Server
|
|
#ifdef XFree86Server
|
|
@@ -100,3 +104,4 @@ typedef int Status;
|
|
# undef _XFree86Server
|
|
#endif
|
|
|
|
+#endif
|