archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MFB - We don't need the simplexml requirement here anymore

Browse source
This commit is contained in:
Rasmus Lerdorf 2005-11-05 22:32:55 +00:00
parent c4ee761db1
commit f16fb8484d
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/dom/php_dom.c
View file

@ -342,7 +342,6 @@ void *php_dom_export_node(zval *object TSRMLS_DC)
Get a simplexml_element object from dom to allow for processing */ Get a simplexml_element object from dom to allow for processing */
PHP_FUNCTION(dom_import_simplexml) PHP_FUNCTION(dom_import_simplexml)
{ {
#ifdef HAVE_SIMPLEXML
zval *rv = NULL; zval *rv = NULL;
zval *node; zval *node;
xmlNodePtr nodep = NULL; xmlNodePtr nodep = NULL;
@ -362,10 +361,6 @@ PHP_FUNCTION(dom_import_simplexml)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Nodetype to import"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Nodetype to import");
RETURN_NULL(); RETURN_NULL();
} }
#else
php_error_docref(NULL TSRMLS_CC, E_WARNING, "SimpleXML support is not enabled");
return;
#endif
} }
/* }}} */ /* }}} */
@ -420,9 +415,6 @@ static zend_object_handlers* dom_get_obj_handlers(TSRMLS_D) {
static zend_module_dep dom_deps[] = { static zend_module_dep dom_deps[] = {
ZEND_MOD_REQUIRED("libxml") ZEND_MOD_REQUIRED("libxml")
ZEND_MOD_CONFLICTS("domxml") ZEND_MOD_CONFLICTS("domxml")
#ifdef HAVE_SIMPLEXML
ZEND_MOD_REQUIRED("simplexml")
#endif
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };