helly Thu Jan 8 14:30:38 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Cannot use shared SPL
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.98 php-src/ext/simplexml/simplexml.c:1.99
--- php-src/ext/simplexml/simplexml.c:1.98 Thu Jan 8 03:17:26 2004
+++ php-src/ext/simplexml/simplexml.c Thu Jan 8 14:30:37 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.98 2004/01/08 08:17:26 andi Exp $ */
+/* $Id: simplexml.c,v 1.99 2004/01/08 19:30:37 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -31,7 +31,7 @@
#include "ext/standard/php_string.h"
#include "php_simplexml.h"
-#if HAVE_SPL
+#if HAVE_SPL && !defined(COMPILE_DL_SPL)
#include "ext/spl/spl_iterators.h"
#endif
@@ -1613,7 +1613,7 @@
INIT_CLASS_ENTRY(sxe, "simplexml_element", sxe_functions);
sxe.create_object = sxe_object_new;
sxe_class_entry = zend_register_internal_class(&sxe TSRMLS_CC);
-#if HAVE_SPL
+#if HAVE_SPL && !defined(COMPILE_DL_SPL)
zend_class_implements(sxe_class_entry TSRMLS_CC, 1, spl_ce_RecursiveIterator);
#endif
sxe_class_entry->get_iterator = php_sxe_get_iterator;
@@ -1655,7 +1655,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.98 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.99 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php