diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-07 11:05:07 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-07 11:05:07 +0200 |
commit | d1ac7e3ab1bf3cf639ddbd63ed3824e8bb9fc32f (patch) | |
tree | 9d8bd3f15db87e3fe69a31573bae1386e27d67c5 /ext/curl/php_curl.h | |
parent | 8e05c4449673c8fd7bf3e1d3f5ddf4689ddd0bdb (diff) | |
download | php-git-d1ac7e3ab1bf3cf639ddbd63ed3824e8bb9fc32f.tar.gz |
Remove some unnecessary HAVE_EXTNAME guards
A recurring pattern in old extension: Putting the whole source
code behind HAVE_EXTNAME. This is pointless, as the code is only
compiled if the extension is enabled.
This removes a couple of them, but not all.
Diffstat (limited to 'ext/curl/php_curl.h')
-rw-r--r-- | ext/curl/php_curl.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 5022f69d21..2a195b082b 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -21,13 +21,6 @@ #include "php.h" #include "zend_smart_str.h" -#ifdef COMPILE_DL_CURL -#undef HAVE_CURL -#define HAVE_CURL 1 -#endif - -#ifdef HAVE_CURL - #define PHP_CURL_DEBUG 0 #ifdef PHP_WIN32 @@ -45,7 +38,7 @@ #include <curl/multi.h> extern zend_module_entry curl_module_entry; -#define curl_module_ptr &curl_module_entry +#define phpext_curl_ptr &curl_module_entry #define CURLOPT_RETURNTRANSFER 19913 #define CURLOPT_BINARYTRANSFER 19914 /* For Backward compatibility */ @@ -180,8 +173,4 @@ int curl_cast_object(zend_object *obj, zval *result, int type); PHP_CURL_API extern zend_class_entry *curl_CURLFile_class; -#else -#define curl_module_ptr NULL -#endif /* HAVE_CURL */ -#define phpext_curl_ptr curl_module_ptr #endif /* _PHP_CURL_H */ |