diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2005-08-23 22:14:02 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2005-08-23 22:14:02 +0000 |
| commit | bca3ad25f93b7895c4c89ea38551a2873cbbd3e1 (patch) | |
| tree | 2111d818aa14001b9c78f4ae5e83f05b2e5ecc2d /runtest.c | |
| parent | 96688263686b80250571a17f830e47cd5aee9712 (diff) | |
| download | android_external_libxml2-bca3ad25f93b7895c4c89ea38551a2873cbbd3e1.tar.gz android_external_libxml2-bca3ad25f93b7895c4c89ea38551a2873cbbd3e1.tar.bz2 android_external_libxml2-bca3ad25f93b7895c4c89ea38551a2873cbbd3e1.zip | |
fixed compilation when configured --without-sax1 and other cleanups fixes
* SAX2.c globals.c runtest.c testC14N.c testapi.c tree.c
include/libxml/SAX2.h include/libxml/xmlregexp.h: fixed compilation
when configured --without-sax1 and other cleanups fixes bug #172683
* doc/* elfgcchack.h: regenerated
Daniel
Diffstat (limited to 'runtest.c')
| -rw-r--r-- | runtest.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -3529,7 +3529,7 @@ load_xpath_expr (xmlDocPtr parent_doc, const char* filename) { xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; xmlSubstituteEntitiesDefault(1); - doc = xmlParseFile(filename); + doc = xmlReadFile(filename, NULL, XML_PARSE_DTDATTR | XML_PARSE_NOENT); if (doc == NULL) { fprintf(stderr, "Error: unable to parse file \"%s\"\n", filename); return(NULL); @@ -3681,7 +3681,7 @@ c14nRunTest(const char* xml_filename, int with_comments, int exclusive, xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; xmlSubstituteEntitiesDefault(1); - doc = xmlParseFile(xml_filename); + doc = xmlReadFile(xml_filename, NULL, XML_PARSE_DTDATTR | XML_PARSE_NOENT); if (doc == NULL) { fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_filename); return(-1); @@ -3816,7 +3816,7 @@ c14nExcWithoutCommentTest(const char *filename, return(c14nCommonTest(filename, 0, 1, "exc-without-comments")); } #endif -#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED) +#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED) && defined (LIBXML_SAX1_ENABLED) /************************************************************************ * * * Catalog and threads test * @@ -4245,7 +4245,7 @@ testDesc testDescriptions[] = { c14nExcWithoutCommentTest, "./test/c14n/exc-without-comments/*.xml", NULL, NULL, NULL, 0 }, #endif -#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED) +#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_SAX1_ENABLED) { "Catalog and Threads regression tests" , threadsTest, NULL, NULL, NULL, NULL, 0 }, |