diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-19 15:42:01 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-24 14:12:39 +0100 |
| commit | bf244757eeaf9940928b044faebeb20d7f677844 (patch) | |
| tree | e5ec825c28d35df44ad7ecd5d5d84ec9f7988cf1 | |
| parent | e589609b4c08209fb414ffd189dfd2b49cc145ca (diff) | |
| download | php-git-bf244757eeaf9940928b044faebeb20d7f677844.tar.gz | |
Allow PHP_CURL_APIs to be imported by DLLs
Closes GH-6438.
| -rw-r--r-- | ext/curl/config.w32 | 2 | ||||
| -rw-r--r-- | ext/curl/php_curl.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index 9402e5b3ec..f722c5faca 100644 --- 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 index ebb56278aa..88806262ec 100644 --- 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 |