diff options
| author | Christian Stocker <chregu@php.net> | 2004-02-23 09:19:25 +0000 |
|---|---|---|
| committer | Christian Stocker <chregu@php.net> | 2004-02-23 09:19:25 +0000 |
| commit | 830d453a2f707f186051d2d3ae5ab3baa08d3edf (patch) | |
| tree | 5aef5a2c1297acc3856fa7a8c0943be795f630c3 /ext | |
| parent | 4a14e5c30d2faa955f158249a036cdd5ddd876e7 (diff) | |
| download | php-git-830d453a2f707f186051d2d3ae5ab3baa08d3edf.tar.gz | |
remove compiler warnings
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/xml/compat.c | 2 | ||||
| -rw-r--r-- | ext/xml/xml.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 |