mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 07:19:00 +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>
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
|
|
index 603d05669..8596cb434 100644
|
|
--- a/include/X11/Xlibint.h
|
|
+++ b/include/X11/Xlibint.h
|
|
@@ -389,23 +389,26 @@ struct _XLockPtrs {
|
|
#define _XLockMutex_fn (*_XLockMutex_fn_p)
|
|
#define _XUnlockMutex_fn (*_XUnlockMutex_fn_p)
|
|
#define _Xglobal_lock (*_Xglobal_lock_p)
|
|
+#define X_LOCK_EXTERN __declspec(dllimport) extern
|
|
+#else
|
|
+#define X_LOCK_EXTERN extern
|
|
#endif
|
|
|
|
/* in XlibInt.c */
|
|
-extern void (*_XCreateMutex_fn)(
|
|
+X_LOCK_EXTERN void (*_XCreateMutex_fn)(
|
|
LockInfoPtr /* lock */
|
|
);
|
|
-extern void (*_XFreeMutex_fn)(
|
|
+X_LOCK_EXTERN void (*_XFreeMutex_fn)(
|
|
LockInfoPtr /* lock */
|
|
);
|
|
-extern void (*_XLockMutex_fn)(
|
|
+X_LOCK_EXTERN void (*_XLockMutex_fn)(
|
|
LockInfoPtr /* lock */
|
|
#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
|
|
, char * /* file */
|
|
, int /* line */
|
|
#endif
|
|
);
|
|
-extern void (*_XUnlockMutex_fn)(
|
|
+X_LOCK_EXTERN void (*_XUnlockMutex_fn)(
|
|
LockInfoPtr /* lock */
|
|
#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
|
|
, char * /* file */
|
|
@@ -413,7 +416,7 @@ extern void (*_XUnlockMutex_fn)(
|
|
#endif
|
|
);
|
|
|
|
-extern LockInfoPtr _Xglobal_lock;
|
|
+X_LOCK_EXTERN LockInfoPtr _Xglobal_lock;
|
|
|
|
#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
|
|
#define LockDisplay(d) if ((d)->lock_fns) (*(d)->lock_fns->lock_display)((d),__FILE__,__LINE__)
|