From: Christian Stocker <chregu@php.net>
Date: Mon, 23 Feb 2004 09:19:25 +0000 (+0000)
Subject: remove compiler warnings
X-Git-Tag: RELEASE_0_2_0~219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=830d453a2f707f186051d2d3ae5ab3baa08d3edf;p=php

remove compiler warnings
---

diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index 7814465058..57b5f764a4 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -33,6 +33,7 @@ typedef struct _php_xml_ns {
 	((__ns) != NULL && strlen(__ns) == 5 && *(__ns) == 'x' && *((__ns)+1) == 'm' && \
 	 *((__ns)+2) == 'l' && *((__ns)+3) == 'n' && *((__ns)+4) == 's')
 
+#if LIBXML_VERSION >= 20600 
 static void 
 _qualify_namespace(XML_Parser parser, const xmlChar *name, const xmlChar *URI, xmlChar **qualified)
 {
@@ -45,6 +46,7 @@ _qualify_namespace(XML_Parser parser, const xmlChar *name, const xmlChar *URI, x
 		*qualified = xmlStrdup(name);
 	}
 }
+#endif
 
 static void
 _start_element_handler(void *user, const xmlChar *name, const xmlChar **attributes)
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index f9ddc740de..1d91f6e1ac 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -1110,7 +1110,7 @@ PHP_FUNCTION(xml_parser_create)
 PHP_FUNCTION(xml_parser_create_ns)
 {
 #if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT) && LIBXML_VERSION < 20600 
-	php_error_docref(NULL TSRMLS_CC, E_ERROR, "is broken with libxml2 %d. Please upgrade to libxml2 2.6", LIBXML_DOTTED_VERSION);
+	php_error_docref(NULL TSRMLS_CC, E_ERROR, "is broken with libxml2 %s. Please upgrade to libxml2 2.6", LIBXML_DOTTED_VERSION);
 #else
 	php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 #endif