mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
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.
This commit is contained in:
parent
82814fc852
commit
04a291d39a
@ -364,7 +364,6 @@ void *php_dom_export_node(zval *object TSRMLS_DC)
|
||||
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_FUNCTION(dom_import_simplexml)
|
||||
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_object_handlers* dom_get_obj_handlers(TSRMLS_D) {
|
||||
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}
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user