damn XML_FEATURE_UNICODE clashes with Expat headers rename to XML_WITH_ to
* include/libxml/parser.h parser.c xmllint.c: damn XML_FEATURE_UNICODE
clashes with Expat headers rename to XML_WITH_ to fix bug #316053.
* doc/Makefile.am: build devhelp before the examples.
* doc/*: regenerated the API
Daniel
diff --git a/parser.c b/parser.c
index 9c7247c..ce6e003 100644
--- a/parser.c
+++ b/parser.c
@@ -601,181 +601,181 @@
xmlHasFeature(xmlFeature feature)
{
switch (feature) {
- case XML_FEATURE_THREAD:
+ case XML_WITH_THREAD:
#ifdef LIBXML_THREAD_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_TREE:
+ case XML_WITH_TREE:
#ifdef LIBXML_TREE_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_OUTPUT:
+ case XML_WITH_OUTPUT:
#ifdef LIBXML_OUTPUT_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_PUSH:
+ case XML_WITH_PUSH:
#ifdef LIBXML_PUSH_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_READER:
+ case XML_WITH_READER:
#ifdef LIBXML_READER_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_PATTERN:
+ case XML_WITH_PATTERN:
#ifdef LIBXML_PATTERN_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_WRITER:
+ case XML_WITH_WRITER:
#ifdef LIBXML_WRITER_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_SAX1:
+ case XML_WITH_SAX1:
#ifdef LIBXML_SAX1_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_FTP:
+ case XML_WITH_FTP:
#ifdef LIBXML_FTP_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_HTTP:
+ case XML_WITH_HTTP:
#ifdef LIBXML_HTTP_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_VALID:
+ case XML_WITH_VALID:
#ifdef LIBXML_VALID_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_HTML:
+ case XML_WITH_HTML:
#ifdef LIBXML_HTML_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_LEGACY:
+ case XML_WITH_LEGACY:
#ifdef LIBXML_LEGACY_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_C14N:
+ case XML_WITH_C14N:
#ifdef LIBXML_C14N_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_CATALOG:
+ case XML_WITH_CATALOG:
#ifdef LIBXML_CATALOG_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_XPATH:
+ case XML_WITH_XPATH:
#ifdef LIBXML_XPATH_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_XPTR:
+ case XML_WITH_XPTR:
#ifdef LIBXML_XPTR_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_XINCLUDE:
+ case XML_WITH_XINCLUDE:
#ifdef LIBXML_XINCLUDE_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_ICONV:
+ case XML_WITH_ICONV:
#ifdef LIBXML_ICONV_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_ISO8859X:
+ case XML_WITH_ISO8859X:
#ifdef LIBXML_ISO8859X_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_UNICODE:
+ case XML_WITH_UNICODE:
#ifdef LIBXML_UNICODE_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_REGEXP:
+ case XML_WITH_REGEXP:
#ifdef LIBXML_REGEXP_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_AUTOMATA:
+ case XML_WITH_AUTOMATA:
#ifdef LIBXML_AUTOMATA_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_EXPR:
+ case XML_WITH_EXPR:
#ifdef LIBXML_EXPR_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_SCHEMAS:
+ case XML_WITH_SCHEMAS:
#ifdef LIBXML_SCHEMAS_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_SCHEMATRON:
+ case XML_WITH_SCHEMATRON:
#ifdef LIBXML_SCHEMATRON_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_MODULES:
+ case XML_WITH_MODULES:
#ifdef LIBXML_MODULES_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_DEBUG:
+ case XML_WITH_DEBUG:
#ifdef LIBXML_DEBUG_ENABLED
return(1);
#else
return(0);
#endif
- case XML_FEATURE_DEBUG_MEM:
+ case XML_WITH_DEBUG_MEM:
#ifdef DEBUG_MEMORY_LOCATION
return(1);
#else
return(0);
#endif
- case XML_FEATURE_DEBUG_RUN:
+ case XML_WITH_DEBUG_RUN:
#ifdef LIBXML_DEBUG_RUNTIME
return(1);
#else