From: foobar <sniper@php.net>
Date: Thu, 30 Jun 2005 11:15:00 +0000 (+0000)
Subject: - Unify (+ spl can't be build shared so COMPILE_DL_SPL
X-Git-Tag: php-5.1.0b3~252
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=340bcffdf0087d9a3e806217261612db1a3587ba;p=php

- 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 573b36603f..faa107965b 100644
--- 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 a9166d8297..d57c0524f9 100644
--- 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 94cbe23578..55ccaf576e 100644
--- 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;