[PHP-CVS] cvs: php-src /ext/dom php_dom.c

[Rasmus Lerdorf]

rasmus          Sat Nov  5 17:32:56 2005 EDT

  Modified files:              
    /php-src/ext/dom    php_dom.c 
  Log:
  MFB - We don't need the simplexml requirement here anymore
  
  
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.80&r2=1.81&ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.80 php-src/ext/dom/php_dom.c:1.81
--- php-src/ext/dom/php_dom.c:1.80      Mon Sep 19 14:47:36 2005
+++ php-src/ext/dom/php_dom.c   Sat Nov  5 17:32:55 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_dom.c,v 1.80 2005/09/19 18:47:36 dmitry Exp $ */
+/* $Id: php_dom.c,v 1.81 2005/11/05 22:32:55 rasmus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -342,7 +342,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;
@@ -362,10 +361,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
 }
 /* }}} */
 
@@ -420,9 +415,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