rasmus Sat Nov 5 17:37:19 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/simplexml simplexml.c
Log:
And simplexml doesn't need dom anymore to do the import
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.151.2.5&r2=1.151.2.6&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.5
php-src/ext/simplexml/simplexml.c:1.151.2.6
--- php-src/ext/simplexml/simplexml.c:1.151.2.5 Mon Oct 31 16:20:44 2005
+++ php-src/ext/simplexml/simplexml.c Sat Nov 5 17:37:18 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.151.2.5 2005/10/31 21:20:44 helly Exp $ */
+/* $Id: simplexml.c,v 1.151.2.6 2005/11/05 22:37:18 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1597,7 +1597,6 @@
return php_sxe_get_first_node(sxe, node TSRMLS_CC);
}
-#ifdef HAVE_DOM
/* {{{ proto simplemxml_element simplexml_import_dom(domNode node [, string
class_name])
Get a simplexml_element object from dom to allow for processing */
PHP_FUNCTION(simplexml_import_dom)
@@ -1650,14 +1649,11 @@
}
}
/* }}} */
-#endif
function_entry simplexml_functions[] = {
PHP_FE(simplexml_load_file, NULL)
PHP_FE(simplexml_load_string, NULL)
-#ifdef HAVE_DOM
PHP_FE(simplexml_import_dom, NULL)
-#endif
{NULL, NULL, NULL}
};
@@ -1745,7 +1741,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.5 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.6 $");
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
