diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2005-11-05 22:25:12 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2005-11-05 22:25:12 +0000 |
| commit | 04a291d39a586d531f7c09872e7f3ced7c98b9e0 (patch) | |
| tree | b4b791f7aee3e13031bc2c568b34bdb6e8b15647 | |
| parent | 82814fc852d0a67529796d6f4923cc51a3b2e80c (diff) | |
| download | php-git-04a291d39a586d531f7c09872e7f3ced7c98b9e0.tar.gz | |
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.
| -rw-r--r-- | ext/dom/php_dom.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index c972736d6f..e9f04d5a46 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -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} }; |