mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 03:19:01 +08:00
cc00cf05fb
* Add libplist * Add libusbmuxd * Fix typos * Add getopt * Add libimobiledevice * Fix typos * Add libideviceactivation * Add ideviceinstaller * Include utilities * Install usbmuxd * Add readline * Fix readline on 64-bit windows * Add libirecovery * libideviceactivation: include tools * Bump versions to fix build issues * Bump versions * Add idevicerestore * [getopt][getopt-win32] Rename to getopt-win32 and only install on Windows Desktop * [readline][readline-win32] Rename to readline-win32 and only install for Windows Desktop * [vcpkg_from_github][vcpkg_apply_patches] Make PATCHES relative to the current port directory * [vcpkg_install_msbuild][vcpkg_check_linkage] Introduce vcpkg_install_msbuild() and vcpkg_check_linkage(). * [libimobiledevice et al] Use vcpkg_from_github() and vcpkg_install_msbuild() * [readline] Fix static builds
38 lines
877 B
Diff
38 lines
877 B
Diff
diff --git a/include/plist/plist.h b/include/plist/plist.h
|
|
index 2863c74..9cdb219 100644
|
|
--- a/include/plist/plist.h
|
|
+++ b/include/plist/plist.h
|
|
@@ -42,7 +42,7 @@ extern "C"
|
|
#include <stdint.h>
|
|
#endif
|
|
|
|
-#ifdef _MSC_VER
|
|
+#if defined(_MSC_VER) && defined(LIBPLIST_EXPORTS)
|
|
#define PLIST_API_MSC __declspec( dllexport )
|
|
#else
|
|
#define PLIST_API_MSC
|
|
diff --git a/src/plist.h b/src/plist.h
|
|
index 1e5d0d1..6690343 100644
|
|
--- a/src/plist.h
|
|
+++ b/src/plist.h
|
|
@@ -39,10 +39,7 @@
|
|
#include <sys/time.h>
|
|
#endif
|
|
|
|
-#ifdef _MSC_VER
|
|
- #define PLIST_API __declspec( dllexport )
|
|
-#else
|
|
-#ifdef WIN32
|
|
+#if (defined(_MSC_VER) || defined(WIN32)) && defined(LIBPLIST_EXPORTS)
|
|
#define PLIST_API __declspec( dllexport )
|
|
#else
|
|
#ifdef HAVE_FVISIBILITY
|
|
@@ -51,7 +48,6 @@
|
|
#define PLIST_API
|
|
#endif
|
|
#endif
|
|
-#endif
|
|
|
|
struct plist_data_s
|
|
{
|