rasmus Sat Nov 5 17:25:17 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/dom php_dom.c
Log:
This SimpleXML requirement is no longer needed and by removing it we
remove a circular dep where it was impossible to build simplexml shared
and not load it.
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.73.2.2&r2=1.73.2.3&ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.2 php-src/ext/dom/php_dom.c:1.73.2.3
--- php-src/ext/dom/php_dom.c:1.73.2.2 Mon Sep 19 14:47:56 2005
+++ php-src/ext/dom/php_dom.c Sat Nov 5 17:25:12 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.73.2.2 2005/09/19 18:47:56 dmitry Exp $ */
+/* $Id: php_dom.c,v 1.73.2.3 2005/11/05 22:25:12 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -364,7 +364,6 @@
Get a simplexml_element object from dom to allow for processing */
PHP_FUNCTION(dom_import_simplexml)
{
-#ifdef HAVE_SIMPLEXML
zval *rv = NULL;
zval *node;
xmlNodePtr nodep = NULL;
@@ -384,10 +383,6 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Nodetype
to import");
RETURN_NULL();
}
-#else
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "SimpleXML support is not
enabled");
- return;
-#endif
}
/* }}} */
@@ -442,9 +437,6 @@
static zend_module_dep dom_deps[] = {
ZEND_MOD_REQUIRED("libxml")
ZEND_MOD_CONFLICTS("domxml")
-#ifdef HAVE_SIMPLEXML
- ZEND_MOD_REQUIRED("simplexml")
-#endif
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
