sniper Thu Jun 30 07:15:00 2005 EDT
Modified files:
/php-src/ext/simplexml php_simplexml.h simplexml.c
/php-src/ext/standard array.c
Log:
- Unify (+ spl can't be build shared so COMPILE_DL_SPL
http://cvs.php.net/diff.php/php-src/ext/simplexml/php_simplexml.h?r1=1.18&r2=1.19&ty=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.18
php-src/ext/simplexml/php_simplexml.h:1.19
--- php-src/ext/simplexml/php_simplexml.h:1.18 Thu Feb 12 19:02:19 2004
+++ php-src/ext/simplexml/php_simplexml.h Thu Jun 30 07:14:56 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_simplexml.h,v 1.18 2004/02/13 00:02:19 fmk Exp $ */
+/* $Id: php_simplexml.h,v 1.19 2005/06/30 11:14:56 sniper Exp $ */
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -48,7 +48,7 @@
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);
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.148&r2=1.149&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.148
php-src/ext/simplexml/simplexml.c:1.149
--- php-src/ext/simplexml/simplexml.c:1.148 Fri Jun 17 07:35:22 2005
+++ php-src/ext/simplexml/simplexml.c Thu Jun 30 07:14:56 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.148 2005/06/17 11:35:22 sniper Exp $ */
+/* $Id: simplexml.c,v 1.149 2005/06/30 11:14:56 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -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 @@
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);
}
@@ -1735,7 +1735,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.148 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.149 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.304&r2=1.305&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.304 php-src/ext/standard/array.c:1.305
--- php-src/ext/standard/array.c:1.304 Tue Jun 21 08:10:51 2005
+++ php-src/ext/standard/array.c Thu Jun 30 07:15:00 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.304 2005/06/21 12:10:51 dmitry Exp $ */
+/* $Id: array.c,v 1.305 2005/06/30 11:15:00 sniper Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -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 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
