rrichards               Fri Aug 29 13:36:35 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/domxml php_domxml.h php_domxml.c 
  Log:
  fix builds using libxml 2.5.10+
  
Index: php-src/ext/domxml/php_domxml.h
diff -u php-src/ext/domxml/php_domxml.h:1.72.4.2 
php-src/ext/domxml/php_domxml.h:1.72.4.3
--- php-src/ext/domxml/php_domxml.h:1.72.4.2    Tue Apr  8 14:26:50 2003
+++ php-src/ext/domxml/php_domxml.h     Fri Aug 29 13:36:34 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_domxml.h,v 1.72.4.2 2003/04/08 18:26:50 chregu Exp $ */
+/* $Id: php_domxml.h,v 1.72.4.3 2003/08/29 17:36:34 rrichards Exp $ */
 
 #ifndef PHP_DOMXML_H
 #define PHP_DOMXML_H
@@ -24,6 +24,7 @@
 #if HAVE_DOMXML
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
+#include <libxml/Sax.h>
 #include <libxml/tree.h>
 #include <libxml/xmlerror.h>
 #include <libxml/xinclude.h>
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.29 
php-src/ext/domxml/php_domxml.c:1.218.2.30
--- php-src/ext/domxml/php_domxml.c:1.218.2.29  Fri Aug 29 11:29:24 2003
+++ php-src/ext/domxml/php_domxml.c     Fri Aug 29 13:36:34 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_domxml.c,v 1.218.2.29 2003/08/29 15:29:24 rrichards Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.30 2003/08/29 17:36:34 rrichards Exp $ */
 
 /* TODO
  * - Support Notation Nodes
@@ -1414,7 +1414,7 @@
                add_assoc_string(errormessages,"errormessage",buf,1);                  
         
                input = ctxt->input;
                if (ctxt->name) {
-                       add_assoc_string(errormessages,"nodename",ctxt->name,1); 
+                       add_assoc_string(errormessages,"nodename",(char *) 
ctxt->name,1); 
                }
                if (input != NULL) {
                        add_assoc_long(errormessages,"line",input->line);
@@ -1450,7 +1450,7 @@
                } 
                if (ctxt->parser != NULL) {
                        if (ctxt->parser->name) {
-                               
add_assoc_string(errormessages,"nodename",ctxt->parser->name,1); 
+                               add_assoc_string(errormessages,"nodename",(char 
*)ctxt->parser->name,1); 
                        }
 
                        if (ctxt->parser->input != NULL) {

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

Reply via email to