- Unify (+ spl can't be build shared so COMPILE_DL_SPL

diff --git a/ext/simplexml/php_simplexml.h b/ext/simplexml/php_simplexml.h
index 573b36603fa6f17880a453301f72e27d395abf8f..faa107965b7cda691b64df65fcb19e91a0467794 100644 (file)
--- a/ext/simplexml/php_simplexml.h
+++ b/ext/simplexml/php_simplexml.h
@@ -48,7 +48,7 @@ extern zend_module_entry simplexml_module_entry;
 
 PHP_MINIT_FUNCTION(simplexml);
 PHP_MSHUTDOWN_FUNCTION(simplexml);
-#if HAVE_SPL && !defined(COMPILE_DL_SPL)
+#ifdef HAVE_SPL
 PHP_RINIT_FUNCTION(simplexml);
 #endif
 PHP_MINFO_FUNCTION(simplexml);

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index a9166d82975d82e4070216ed78b328cd5085753e..d57c0524f90d8c6b8191a05c210463da0d14b4bf 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -34,7 +34,7 @@
 #include "php_simplexml_exports.h"
 #include "zend_exceptions.h"
 #include "zend_interfaces.h"
-#if HAVE_SPL && !defined(COMPILE_DL_SPL)
+#ifdef HAVE_SPL
 #include "ext/spl/spl_sxe.h"
 #endif
 
@@ -1709,7 +1709,7 @@ PHP_MINIT_FUNCTION(simplexml)
        sxe_ze1_object_handlers.get_class_name = zend_get_std_object_handlers()->get_class_name;
        sxe_ze1_object_handlers.clone_obj = sxe_object_ze1_clone;
 
-#if HAVE_SPL && !defined(COMPILE_DL_SPL)
+#ifdef HAVE_SPL
        if (zend_get_module_started("spl") == SUCCESS) {
                PHP_MINIT(spl_sxe)(INIT_FUNC_ARGS_PASSTHRU);
        }

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 94cbe2357854b52e13f8f8ec0dd7a613a5dfea15..55ccaf576e1b7a5c82a582505c2728a9a7b3acf0 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -46,7 +46,7 @@
 #include "php_string.h"
 #include "php_rand.h"
 #include "php_smart_str.h"
-#if HAVE_SPL
+#ifdef HAVE_SPL
 #include "ext/spl/spl_array.h"
 #endif
 
@@ -319,7 +319,7 @@ PHP_FUNCTION(count)
                        RETURN_LONG (php_count_recursive (array, mode TSRMLS_CC));
                        break;
                case IS_OBJECT: {
-#if HAVE_SPL
+#ifdef HAVE_SPL
                        /* it the object implements Countable we call its count() method */
                        zval *retval;