--- embedaddon/libxml2/runxmlconf.c 2012/02/21 23:37:58 1.1 +++ embedaddon/libxml2/runxmlconf.c 2014/06/15 19:53:31 1.1.1.3 @@ -6,11 +6,8 @@ * daniel@veillard.com */ -#ifdef HAVE_CONFIG_H #include "libxml.h" -#else #include -#endif #ifdef LIBXML_XPATH_ENABLED @@ -37,14 +34,7 @@ static int verbose = 0; #define NB_EXPECTED_ERRORS 15 -#if defined(_WIN32) && !defined(__CYGWIN__) -#define vsnprintf _vsnprintf - -#define snprintf _snprintf - -#endif - const char *skipped_tests[] = { /* http://lists.w3.org/Archives/Public/public-xml-testsuite/2008Jul/0000.html */ "rmt-ns10-035", @@ -393,7 +383,7 @@ xmlconfTestItem(xmlDocPtr doc, xmlNodePtr cur) { if (xmlStrEqual(type, BAD_CAST "not-wf")) { if (nstest == 0) xmlconfTestNotWF((char *) id, (char *) filename, options); - else + else xmlconfTestNotNSWF((char *) id, (char *) filename, options); } else if (xmlStrEqual(type, BAD_CAST "valid")) { options |= XML_PARSE_DTDVALID; @@ -516,7 +506,7 @@ static void xmlconfInfo(void) { fprintf(stderr, " you need to fetch and extract the\n"); fprintf(stderr, " latest XML Conformance Test Suites\n"); - fprintf(stderr, " http://www.w3.org/XML/Test/xmlts20080205.tar.gz\n"); + fprintf(stderr, " http://www.w3.org/XML/Test/xmlts20080827.tar.gz\n"); fprintf(stderr, " see http://www.w3.org/XML/Test/ for informations\n"); }