cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c
| From: | Hannes Magnusson | Date: | Thu, 11 Jun 2009 09:41:15 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58626@lists.php.net to get a copy of this message | ||
bjori Thu Jun 11 09:41:15 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/simplexml simplexml.c
Log:
MFH: Mark spl as required and fix extension loading order
# Not needed in 5.2 as the simplexmliterator is part of spl there
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.31&r2=1.151.2.22.2.35.2.32&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.31
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.32
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.31 Tue Feb 3 21:42:35 2009
+++ php-src/ext/simplexml/simplexml.c Thu Jun 11 09:41:15 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.31 2009/02/03 21:42:35 davidc Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.32 2009/06/11 09:41:15 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2470,6 +2470,7 @@
static const zend_module_dep simplexml_deps[] = { /* {{{ */
ZEND_MOD_REQUIRED("libxml")
+ ZEND_MOD_REQUIRED("spl")
{NULL, NULL, NULL}
};
/* }}} */
@@ -2555,7 +2556,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35.2.31 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35.2.32 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");