]> granicus.if.org Git - php/commitdiff
MFB - We don't need the simplexml requirement here anymore
authorRasmus Lerdorf <rasmus@php.net>
Sat, 5 Nov 2005 22:32:55 +0000 (22:32 +0000)
committerRasmus Lerdorf <rasmus@php.net>
Sat, 5 Nov 2005 22:32:55 +0000 (22:32 +0000)
ext/dom/php_dom.c

index a6ff59ad1e6d35f58010a98bfdb20e4fa40ea1a8..58c18df620cb12c536e2fe47b7f859a3099e1115 100644 (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 */
 PHP_FUNCTION(dom_import_simplexml)
 {
-#ifdef HAVE_SIMPLEXML
        zval *rv = NULL;
        zval *node;
        xmlNodePtr nodep = NULL;
@@ -362,10 +361,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
 }
 /* }}} */
 
@@ -420,9 +415,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}
 };