From d1ac7e3ab1bf3cf639ddbd63ed3824e8bb9fc32f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 7 Sep 2020 11:05:07 +0200 Subject: 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. --- ext/curl/php_curl.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'ext/curl/php_curl.h') 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 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 */ -- cgit v1.2.1