rrichards               Mon Oct 20 19:29:04 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/simplexml      simplexml.c 
  Log:
  MFH: fix bug #46323 (compilation of simplexml for NetWare breaks)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.21&r2=1.151.2.22.2.35.2.22&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.21 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.22
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.21      Thu Oct 16 
11:38:25 2008
+++ php-src/ext/simplexml/simplexml.c   Mon Oct 20 19:29:04 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.21 2008/10/16 11:38:25 indeyets Exp $ 
*/
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.22 2008/10/20 19:29:04 rrichards Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1274,7 +1274,7 @@
                        if (nodeptr->type == XML_TEXT_NODE) {
                                _node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
                        } else if (nodeptr->type == XML_ATTRIBUTE_NODE) {
-                               _node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? nodeptr->ns->href : 
NULL, 0 TSRMLS_CC);
+                               _node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? (xmlChar 
*)nodeptr->ns->href : NULL, 0 TSRMLS_CC);
                        } else {
                                _node_as_zval(sxe, nodeptr, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
                        }
@@ -2562,7 +2562,7 @@
 {
        php_info_print_table_start();
        php_info_print_table_header(2, "Simplexml support", "enabled");
-       php_info_print_table_row(2, "Revision", "$Revision: 
1.151.2.22.2.35.2.21 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 
1.151.2.22.2.35.2.22 $");
        php_info_print_table_row(2, "Schema support",
 #ifdef LIBXML_SCHEMAS_ENABLED
                "enabled");



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to