Allow PHP_CURL_APIs to be imported by DLLs

Closes GH-6438.
php · Nov 24, 2020 · bf24475 · bf24475
1 parent e589609
commit bf24475
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
@@ -28,7 +28,7 @@ if (PHP_CURL != "no") {
 		) {
 		EXTENSION("curl", "interface.c multi.c share.c curl_file.c");
 		AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
-		ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");
+		ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB /D PHP_CURL_EXPORTS=1");
 		PHP_INSTALL_HEADERS("ext/curl", "php_curl.h");
 		// TODO: check for curl_version_info
 	} else {

diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
@@ -21,7 +21,11 @@
 #include "php.h"
 
 #ifdef PHP_WIN32
-# define PHP_CURL_API __declspec(dllexport)
+# ifdef PHP_CURL_EXPORTS
+#  define PHP_CURL_API __declspec(dllexport)
+# else
+#  define PHP_CURL_API __declspec(dllimport)
+# endif
 #elif defined(__GNUC__) && __GNUC__ >= 4
 # define PHP_CURL_API __attribute__ ((visibility("default")))
 #else