chregu Mon Feb 23 04:19:27 2004 EDT
Modified files:
/php-src/ext/xml compat.c xml.c
Log:
remove compiler warnings
http://cvs.php.net/diff.php/php-src/ext/xml/compat.c?r1=1.27&r2=1.28&ty=u
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.27 php-src/ext/xml/compat.c:1.28
--- php-src/ext/xml/compat.c:1.27 Mon Feb 23 03:21:07 2004
+++ php-src/ext/xml/compat.c Mon Feb 23 04:19:25 2004
@@ -33,6 +33,7 @@
((__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 @@
*qualified = xmlStrdup(name);
}
}
+#endif
static void
_start_element_handler(void *user, const xmlChar *name, const xmlChar **attributes)
http://cvs.php.net/diff.php/php-src/ext/xml/xml.c?r1=1.148&r2=1.149&ty=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.148 php-src/ext/xml/xml.c:1.149
--- php-src/ext/xml/xml.c:1.148 Mon Feb 23 03:21:07 2004
+++ php-src/ext/xml/xml.c Mon Feb 23 04:19:25 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.148 2004/02/23 08:21:07 chregu Exp $ */
+/* $Id: xml.c,v 1.149 2004/02/23 09:19:25 chregu Exp $ */
#define IS_EXT_MODULE
@@ -1110,7 +1110,7 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
