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.

diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c
index 4a2b8328b9b722b0f9abdd647dc67190bea3e1d1..3888840fd16a66cec1758a0cc54602d4511cc0ce 100644 (file)
--- a/ext/curl/curl_file.c
+++ b/ext/curl/curl_file.c
@@ -23,7 +23,6 @@
 #include "Zend/zend_interfaces.h"
 #include "php_curl.h"
 #include "curl_file_arginfo.h"
-#ifdef HAVE_CURL
 
 PHP_CURL_API zend_class_entry *curl_CURLFile_class;
 
@@ -132,5 +131,3 @@ void curlfile_register_class(void)
        zend_declare_property_string(curl_CURLFile_class, "mime", sizeof("mime")-1, "", ZEND_ACC_PUBLIC);
        zend_declare_property_string(curl_CURLFile_class, "postname", sizeof("postname")-1, "", ZEND_ACC_PUBLIC);
 }
-
-#endif

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index a529ef8e73684a8ba61a1d9156b22bbe018b4bf1..906b1c4a0b6622fcc79455f612d9bc060574636a 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -24,8 +24,6 @@
 #include "Zend/zend_interfaces.h"
 #include "Zend/zend_exceptions.h"
 
-#ifdef HAVE_CURL
-
 #include <stdio.h>
 #include <string.h>
 
@@ -3537,5 +3535,3 @@ PHP_FUNCTION(curl_pause)
        RETURN_LONG(curl_easy_pause(ch->cp, bitmask));
 }
 /* }}} */
-
-#endif /* HAVE_CURL */

diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index 55d7f8e4d5e29753739e87160d4188ff8853ee43..954575d54f9c4eb0f0aa5d88487f0931f5dd979f 100644 (file)
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@ -23,8 +23,6 @@
 #include "php.h"
 #include "Zend/zend_interfaces.h"
 
-#ifdef HAVE_CURL
-
 #include "php_curl.h"
 
 #include <curl/curl.h>
@@ -599,5 +597,3 @@ void curl_multi_register_class(const zend_function_entry *method_entries) {
        curl_multi_handlers.clone_obj = NULL;
        curl_multi_handlers.cast_object = curl_cast_object;
 }
-
-#endif

diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index 5022f69d21f880ffb9d653141c09bd32a176ff57..2a195b082ba0183194bd69f5688898d756fcc62f 100644 (file)
--- 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 */

diff --git a/ext/curl/share.c b/ext/curl/share.c
index 407e14cdcffb3b004ae4a075b2ed20d6c86cf0fa..d7eb7be56a23fab486b025e1eac17e6985c60690 100644 (file)
--- a/ext/curl/share.c
+++ b/ext/curl/share.c
@@ -23,8 +23,6 @@
 #include "php.h"
 #include "Zend/zend_interfaces.h"
 
-#ifdef HAVE_CURL
-
 #include "php_curl.h"
 
 #include <curl/curl.h>
@@ -179,5 +177,3 @@ void curl_share_register_class(const zend_function_entry *method_entries) {
        curl_share_handlers.get_constructor = curl_share_get_constructor;
        curl_share_handlers.clone_obj = NULL;
 }
-
-#endif

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index a75b7db57a8eed587f889de3f07043871eddb1a7..b2852628badec1dee3fa875421fe41f430006f13 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -22,8 +22,6 @@
 #include "php.h"
 #include "ext/standard/file.h"
 
-#ifdef HAVE_EXIF
-
 /* When EXIF_DEBUG is defined the module generates a lot of debug messages
  * that help understanding what is going on. This can and should be used
  * while extending the module as it shows if you are at the right position.
@@ -4791,5 +4789,3 @@ PHP_FUNCTION(exif_imagetype)
        }
 }
 /* }}} */
-
-#endif

diff --git a/ext/exif/php_exif.h b/ext/exif/php_exif.h
index 466b02645fac15f0edbc953657b1419f4d67dc89..fbc91a0f853938407f7f218478056b9b41fa87ac 100644 (file)
--- a/ext/exif/php_exif.h
+++ b/ext/exif/php_exif.h
@@ -15,12 +15,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifdef HAVE_EXIF
-
 #include "php_version.h"
 #define PHP_EXIF_VERSION PHP_VERSION
 
 extern zend_module_entry exif_module_entry;
 #define phpext_exif_ptr &exif_module_entry
-
-#endif

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 3defd3d506ffb2de68789fea8b29c1d985624b38..7ce3386c57b20ed20e84ebc53a0d94c7fb773a7a 100644 (file)
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -21,8 +21,6 @@
 
 #include "php.h"
 
-#ifdef HAVE_FTP
-
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -2266,5 +2264,3 @@ bail:
        return PHP_FTP_FAILED;
 }
 /* }}} */
-
-#endif /* HAVE_FTP */

diff --git a/ext/ftp/php_ftp.h b/ext/ftp/php_ftp.h
index 60eba04adfd8c7173bb83908f99334be949dbdb5..ac0bef5fd76638c73a6c15b86b7ee56512a1a47a 100644 (file)
--- a/ext/ftp/php_ftp.h
+++ b/ext/ftp/php_ftp.h
@@ -18,10 +18,8 @@
 #ifndef        _INCLUDED_FTP_H
 #define        _INCLUDED_FTP_H
 
-#ifdef HAVE_FTP
-
 extern zend_module_entry php_ftp_module_entry;
-#define php_ftp_module_ptr &php_ftp_module_entry
+#define phpext_ftp_ptr &php_ftp_module_entry
 
 #include "php_version.h"
 #define PHP_FTP_VERSION PHP_VERSION
@@ -34,10 +32,4 @@ extern zend_module_entry php_ftp_module_entry;
 PHP_MINIT_FUNCTION(ftp);
 PHP_MINFO_FUNCTION(ftp);
 
-#define phpext_ftp_ptr php_ftp_module_ptr
-
-#else
-#define php_ftp_module_ptr NULL
-#endif /* HAVE_FTP */
-
 #endif