From 21e4ef20f64ebd740ebac0ead5d85a5631d2db5e Mon Sep 17 00:00:00 2001 From: "William M. Brack" Date: Sun, 2 Jan 2005 09:53:13 +0000 Subject: [PATCH] Re-examined the problems of configuring a "minimal" library. Synchronized the header files with the library code in order to assure that all the various conditionals (LIBXML_xxxx_ENABLED) were the same in both. Modified the API database content to more accurately reflect the conditionals. Enhanced the generation of that database. Although there was no substantial change to any of the library code's logic, a large number of files were modified to achieve the above, and the configuration script was enhanced to do some automatic enabling of features (e.g. --with-xinclude forces --with-xpath). Additionally, all the format errors discovered by apibuild.py were corrected. * configure.in: enhanced cross-checking of options * doc/apibuild.py, doc/elfgcchack.xsl, doc/libxml2-refs.xml, doc/libxml2-api.xml, gentest.py: changed the usage of the element in module descriptions * elfgcchack.h, testapi.c: regenerated with proper conditionals * HTMLparser.c, SAX.c, globals.c, tree.c, xmlschemas.c, xpath.c, testSAX.c: cleaned up conditionals * include/libxml/[SAX.h, SAX2.h, debugXML.h, encoding.h, entities.h, hash.h, parser.h, parserInternals.h, schemasInternals.h, tree.h, valid.h, xlink.h, xmlIO.h, xmlautomata.h, xmlreader.h, xpath.h]: synchronized the conditionals with the corresponding module code * doc/examples/tree2.c, doc/examples/xpath1.c, doc/examples/xpath2.c: added additional conditions required for compilation * doc/*.html, doc/html/*.html: rebuilt the docs --- ChangeLog | 28 + HTMLparser.c | 2 +- SAX.c | 7 +- configure.in | 605 ++-- doc/APIchunk10.html | 5 +- doc/APIchunk12.html | 8 +- doc/APIchunk13.html | 6 +- doc/APIchunk14.html | 4 + doc/APIchunk15.html | 7 +- doc/APIchunk16.html | 5 - doc/APIchunk17.html | 2 +- doc/APIchunk19.html | 2 +- doc/APIchunk20.html | 3 +- doc/APIchunk21.html | 7 +- doc/APIchunk22.html | 10 +- doc/APIchunk3.html | 30 - doc/APIchunk4.html | 2 + doc/APIchunk8.html | 11 +- doc/APIchunk9.html | 3 +- doc/apibuild.py | 85 +- doc/elfgcchack.xsl | 2 +- doc/examples/tree2.c | 2 +- doc/examples/xpath1.c | 2 +- doc/examples/xpath2.c | 3 +- doc/html/book1.html | 2 +- doc/html/index.html | 2 +- doc/html/libxml-DOCBparser.html | 42 +- doc/html/libxml-SAX.html | 152 +- doc/html/libxml-hash.html | 2 +- doc/html/libxml-lib.html | 2 +- doc/html/libxml-parserInternals.html | 4 +- doc/html/libxml-schemasInternals.html | 18 +- doc/html/libxml-xmlmemory.html | 16 +- doc/html/libxml-xmlschemas.html | 4 +- doc/libxml2-api.xml | 4168 +++++++++++++------------ doc/libxml2-refs.xml | 101 +- elfgcchack.h | 1960 ++++++------ gentest.py | 2 +- globals.c | 2 +- include/libxml/SAX.h | 7 +- include/libxml/SAX2.h | 12 +- include/libxml/debugXML.h | 16 +- include/libxml/encoding.h | 2 + include/libxml/entities.h | 8 + include/libxml/hash.h | 6 +- include/libxml/parser.h | 38 +- include/libxml/parserInternals.h | 64 +- include/libxml/schemasInternals.h | 22 +- include/libxml/tree.h | 90 +- include/libxml/valid.h | 43 +- include/libxml/xlink.h | 6 + include/libxml/xmlIO.h | 16 +- include/libxml/xmlautomata.h | 3 + include/libxml/xmlreader.h | 2 + include/libxml/xpath.h | 24 +- testSAX.c | 8 + testapi.c | 1614 +++++----- tree.c | 6 +- win32/libxml2.def.src | 4 + xmlschemas.c | 4 +- xpath.c | 2 +- 61 files changed, 4818 insertions(+), 4497 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ec87383..40484d62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +Sun Jan 2 17:51:18 HKT 2005 William Brack + + Re-examined the problems of configuring a "minimal" library. + Synchronized the header files with the library code in order + to assure that all the various conditionals (LIBXML_xxxx_ENABLED) + were the same in both. Modified the API database content to more + accurately reflect the conditionals. Enhanced the generation + of that database. Although there was no substantial change to + any of the library code's logic, a large number of files were + modified to achieve the above, and the configuration script + was enhanced to do some automatic enabling of features (e.g. + --with-xinclude forces --with-xpath). Additionally, all the format + errors discovered by apibuild.py were corrected. + * configure.in: enhanced cross-checking of options + * doc/apibuild.py, doc/elfgcchack.xsl, doc/libxml2-refs.xml, + doc/libxml2-api.xml, gentest.py: changed the usage of the + element in module descriptions + * elfgcchack.h, testapi.c: regenerated with proper conditionals + * HTMLparser.c, SAX.c, globals.c, tree.c, xmlschemas.c, xpath.c, + testSAX.c: cleaned up conditionals + * include/libxml/[SAX.h, SAX2.h, debugXML.h, encoding.h, entities.h, + hash.h, parser.h, parserInternals.h, schemasInternals.h, tree.h, + valid.h, xlink.h, xmlIO.h, xmlautomata.h, xmlreader.h, xpath.h]: + synchronized the conditionals with the corresponding module code + * doc/examples/tree2.c, doc/examples/xpath1.c, doc/examples/xpath2.c: + added additional conditions required for compilation + * doc/*.html, doc/html/*.html: rebuilt the docs + Sat Dec 25 18:10:02 HKT 2004 William Brack * parserInternals.c: fixed to skip (if necessary) the BOM for diff --git a/HTMLparser.c b/HTMLparser.c index b87b01f9..40a685c7 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -5222,7 +5222,6 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size, } return((xmlParserErrors) ctxt->errNo); } -#endif /* LIBXML_PUSH_ENABLED */ /************************************************************************ * * @@ -5322,6 +5321,7 @@ htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data, return(ctxt); } +#endif /* LIBXML_PUSH_ENABLED */ /** * htmlSAXParseDoc: diff --git a/SAX.c b/SAX.c index 08e8588e..05061b65 100644 --- a/SAX.c +++ b/SAX.c @@ -28,6 +28,7 @@ #include #include +#ifdef LIBXML_LEGACY_ENABLED #ifdef LIBXML_SAX1_ENABLED /** * initxmlDefaultSAXHandler: @@ -76,7 +77,6 @@ initxmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr, int warning) hdlr->initialized = 1; } -#endif /* LIBXML_SAX1_ENABLED */ #ifdef LIBXML_HTML_ENABLED @@ -128,7 +128,6 @@ inithtmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr) #endif /* LIBXML_HTML_ENABLED */ #ifdef LIBXML_DOCB_ENABLED - /** * initdocbDefaultSAXHandler: * @hdlr: the SAX handler @@ -174,3 +173,7 @@ initdocbDefaultSAXHandler(xmlSAXHandlerV1 *hdlr) } #endif /* LIBXML_DOCB_ENABLED */ + +#endif /* LIBXML_SAX1_ENABLED */ + +#endif /* LIBXML_LEGACY_ENABLED */ diff --git a/configure.in b/configure.in index 026e9b12..ffe38078 100644 --- a/configure.in +++ b/configure.in @@ -53,19 +53,97 @@ AM_PROG_LIBTOOL # AM_MAINTAINER_MODE dnl -dnl option to build a minimal libxml2 library +dnl We process the AC_ARG_WITH first so that later we can modify +dnl some of them to try to prevent impossible combinations. This +dnl also allows up so alphabetize the choices dnl -AC_ARG_WITH(minimum, [ --with-minimum build a minimally sized library (off)]) -if test "$with_minimum" = "yes" -then - echo "Configuring for a minimal library" -fi -dnl Checks for zlib library. +dnl +dnl zlib option might change flags, so we save them initially +dnl _cppflags="${CPPFLAGS}" _ldflags="${LDFLAGS}" +AC_ARG_WITH(c14n, +[ --with-c14n add the Canonicalization support (on)]) +AC_ARG_WITH(catalog, +[ --with-catalog add the Catalog support (on)]) +AC_ARG_WITH(debug, +[ --with-debug add the debugging module (on)]) +AC_ARG_WITH(docbook, +[ --with-docbook add Docbook SGML support (on)]) +AC_ARG_WITH(fexceptions, +[ --with-fexceptions add GCC flag -fexceptions for C++ exceptions (off)]) +AC_ARG_WITH(ftp, +[ --with-ftp add the FTP support (on)]) +AC_ARG_WITH(history, +[ --with-history add history support to xmllint shell(off)]) +AC_ARG_WITH(html, +[ --with-html add the HTML support (on)]) +dnl Specific dir for HTML output ? +AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path], + [path to base html directory, default $datadir/doc/html]), + [HTML_DIR=$withval], [HTML_DIR='$(datadir)/doc']) +AC_ARG_WITH(html-subdir, AC_HELP_STRING([--with-html-subdir=path], + [directory used under html-dir, default $PACKAGE-$VERSION/html]), + [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"], + [HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"]) +AC_SUBST(HTML_DIR) +AC_ARG_WITH(http, +[ --with-http add the HTTP support (on)]) +AC_ARG_WITH(iconv, +[ --with-iconv[[=DIR]] add ICONV support (on)]) +AC_ARG_WITH(iso8859x, +[ --with-iso8859x add ISO8859X support if no iconv (on)]) +AC_ARG_WITH(legacy, +[ --with-legacy add deprecated APIs for compatibility (on)]) +AC_ARG_WITH(mem_debug, +[ --with-mem-debug add the memory debugging module (off)]) +AC_ARG_WITH(minimum, +[ --with-minimum build a minimally sized library (off)]) +AC_ARG_WITH(output, +[ --with-output add the serialization support (on)]) +AC_ARG_WITH(pattern, +[ --with-pattern add the xmlPattern selection interface (on)]) +AC_ARG_WITH(push, +[ --with-push add the PUSH parser interfaces (on)]) +AC_ARG_WITH(python, +[ --with-python[[=DIR]] build Python bindings if found]) +AC_ARG_WITH(reader, +[ --with-reader add the xmlReader parsing interface (on)]) +AC_ARG_WITH(readline, +[ --with-readline=DIR use readline in DIR],[ + if test "$withval" != "no" -a "$withval" != "yes"; then + RDL_DIR=$withval + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" + fi +]) +AC_ARG_WITH(regexps, +[ --with-regexps add Regular Expressions support (on)]) +AC_ARG_WITH(run_debug, +[ --with-run-debug add the runtime debugging module (off)]) +AC_ARG_WITH(sax1, +[ --with-sax1 add the older SAX1 interface (on)]) +AC_ARG_WITH(schemas, +[ --with-schemas add Relax-NG and experimental Schemas support (on)]) +AC_ARG_WITH(threads, +[ --with-threads add multithread support(on)]) +AC_ARG_WITH(thread-alloc, +[ --with-thread-alloc add per-thread memory(off)]) +AC_ARG_WITH(tree, +[ --with-tree add the DOM like tree manipulation APIs (on)]) +AC_ARG_WITH(valid, +[ --with-valid add the DTD validation support (on)]) +AC_ARG_WITH(writer, +[ --with-writer add the xmlWriter saving interface (on)]) +AC_ARG_WITH(xinclude, +[ --with-xinclude add the XInclude support (on)]) +AC_ARG_WITH(xpath, +[ --with-xpath add the XPATH support (on)]) +AC_ARG_WITH(xptr, +[ --with-xptr add the XPointer support (on)]) AC_ARG_WITH(zlib, [ --with-zlib[[=DIR]] use libz in DIR],[ if test "$withval" != "no" -a "$withval" != "yes"; then @@ -74,10 +152,148 @@ AC_ARG_WITH(zlib, LDFLAGS="${LDFLAGS} -L$withval/lib" fi ]) -if test "$with_minimum" = "yes" -a "$with_zlib" = "" + +dnl +dnl option to build a minimal libxml2 library +dnl +if test "$with_minimum" = "yes" then - with_zlib=no + echo "Configuring for a minimal library" + if test "$with_c14n" = "" + then + with_c14n=no + fi + if test "$with_catalog" = "" + then + with_catalog=no + fi + echo So far so good! + if test "$with_debug" = "" + then + with_debug=no + fi + if test "$with_docbook" = "" + then + with_docbook=no + fi + if test "$with_fexceptions" = "" + then + with_fexceptions=no + fi + if test "$with_ftp" = "" + then + with_ftp=no + fi + if test "$with_history" = "" + then + with_history=no + fi + if test "$with_html" = "" + then + with_html=no + fi + if test "$with_http" = "" + then + with_http=no + fi + if test "$with_iconv" = "" + then + with_iconv=no + fi + if test "$with_iso8859x" = "" + then + with_iso8859x=no + fi + if test "$with_legacy" = "" + then + with_legacy=no + fi + if test "$with_mem_debug" = "" + then + with_mem_debug=no + fi + if test "$with_output" = "" + then + with_output=no + fi + if test "$with_pattern" = "" + then + with_pattern=no + fi + if test "$with_push" = "" + then + with_push=no + fi + if test "$with_python" = "" + then + with_python=no + fi + if test "$with_reader" = "" + then + with_reader=no + fi + if test "$with_readline" = "" + then + with_readline=no + fi + if test "$with_regexp" = "" + then + with_regexp=no + fi + if test "$with_run_debug" = "" + then + with_run_debug=no + fi + if test "$with_sax1" = "" + then + with_sax1=no + fi + if test "$with_schemas" = "" + then + with_schemas=no + fi + if test "$with_threads" = "" + then + with_threads=no + fi + if test "$with_thread_alloc" = "" + then + with_thread_alloc=no + fi + if test "$with_tree" = "" + then + with_tree=no + fi + if test "$with_valid" = "" + then + with_valid=no + fi + if test "$with_writer" = "" + then + with_writer=no + fi + if test "$with_xinclude" = "" + then + with_xinclude=no + fi + if test "$with_xpath" = "" + then + with_xpath=no + fi + if test "$with_xptr" = "" + then + with_xptr=no + fi + if test "$with_zlib" = "" + then + with_zlib=no + fi fi + +echo Checking zlib + +dnl Checks for zlib library. + if test "$with_zlib" = "no"; then echo "Disabling compression support" else @@ -103,6 +319,8 @@ AC_SUBST(Z_LIBS) CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags} +echo Checking headers + dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC @@ -165,17 +383,8 @@ AC_CHECK_HEADERS([resolv.h], [], [], # endif ]) -dnl Specific dir for HTML output ? -AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path], - [path to base html directory, default $datadir/doc/html]), - [HTML_DIR=$withval], [HTML_DIR='$(datadir)/doc']) -AC_ARG_WITH(html-subdir, AC_HELP_STRING([--with-html-subdir=path], - [directory used under html-dir, default $PACKAGE-$VERSION/html]), - [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"], - [HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"]) - -AC_SUBST(HTML_DIR) +echo Checking libraries dnl Checks for library functions. AC_FUNC_STRFTIME @@ -223,7 +432,7 @@ AC_DEFINE_UNQUOTED(SOCKLEN_T, $SOCKLEN_T, [Determine what socket length (socklen dnl ***********************Checking for availability of IPv6******************* AC_MSG_CHECKING([whether to enable IPv6]) -AC_ARG_ENABLE(ipv6, [ --enable-ipv6=[yes/no] enables compilation of IPv6 code],, enable_ipv6=yes) +AC_ARG_ENABLE(ipv6, [ --enable-ipv6[[=yes/no]] enables compilation of IPv6 code [[default=yes]]],, enable_ipv6=yes) if test "$with_minimum" = "yes" then enable_ipv6=no @@ -298,12 +507,6 @@ dnl XML_CFLAGS="" RDL_LIBS="" -AC_ARG_WITH(fexceptions, -[ --with-fexceptions add GCC flag -fexceptions for C++ exceptions (off)]) -if test "$with_minimum" = "yes" -a "$with_fexceptions" = "" -then - with_fexceptions=no -fi dnl dnl Workaround for native compilers dnl HP : http://bugs.gnome.org/db/31/3163.html @@ -361,12 +564,6 @@ PYTHON_INCLUDES= PYTHON_SITE_PACKAGES= PYTHON_TESTS= pythondir= -AC_ARG_WITH(python, -[ --with-python[[=DIR]] build Python bindings if found]) -if test "$with_minimum" = "yes" -a "$with_python" = "" -then - with_python=no -fi if test "$with_python" != "no" ; then if test -x "$with_python/bin/python" then @@ -433,24 +630,9 @@ AC_SUBST(PYTHON_SUBDIR) dnl dnl Tester makes use of readline if present dnl -_cppflags="${CPPFLAGS}" -_ldflags="${LDFLAGS}" - -AC_ARG_WITH(readline, -[ --with-readline=DIR use readline in DIR],[ - if test "$withval" != "no" -a "$withval" != "yes"; then - RDL_DIR=$withval - CPPFLAGS="${CPPFLAGS} -I$withval/include" - LDFLAGS="${LDFLAGS} -L$withval/lib" - fi -]) -if test "$with_minimum" = "yes" -a "$with_readline" = "" -then - with_readline=no -fi dnl -dnl specific tests to setup DV's devel environment with debug etc ... +dnl specific tests to setup DV and Bill's devel environments with debug etc ... dnl (-Wunreachable-code) dnl if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XML" ]] || \ @@ -494,19 +676,17 @@ AC_SUBST(WITH_TRIO) dnl dnl Allow to enable/disable various pieces dnl +echo Checking configuration requirements +dnl +dnl Thread-related stuff +dnl THREAD_LIBS="" WITH_THREADS=0 THREAD_CFLAGS="" TEST_THREADS="" THREADS_W32="" -AC_ARG_WITH(threads, -[ --with-threads add multithread support(on)]) -if test "$with_minimum" = "yes" -a "$with_threads" = "" -then - with_threads=no -fi if test "$with_threads" = "no" ; then echo Disabling multithreaded support else @@ -529,12 +709,6 @@ else TEST_THREADS="Threadtests" fi fi -AC_ARG_WITH(thread-alloc, -[ --with-thread-alloc add per-thread memory(off)]) -if test "$with_minimum" = "yes" -a "$with_thread_alloc" = "" -then - with_thread_alloc=no -fi if test "$with_thread_alloc" = "yes" -a "$WITH_THREADS" = "1" ; then THREAD_CFLAGS="$THREAD_CFLAGS -DLIBXML_THREAD_ALLOC_ENABLED" fi @@ -545,12 +719,9 @@ AC_SUBST(THREAD_CFLAGS) AC_SUBST(TEST_THREADS) AC_SUBST(THREADS_W32) -AC_ARG_WITH(history, -[ --with-history add history support to xmllint shell(off)]) -if test "$with_minimum" = "yes" -a "$with_history" = "" -then - with_history=no -fi +dnl +dnl xmllint shell history +dnl if test "$with_history" = "yes" ; then echo Enabling xmllint shell history dnl check for terminal library. this is a very cool solution @@ -572,32 +743,12 @@ if test "$with_history" = "yes" ; then if test -n "$RDL_DIR" -a -n "$RDL_LIBS"; then CPPFLAGS="$CPPFLAGS -I${RDL_DIR}/include" RDL_LIBS="-L${RDL_DIR}/lib $RDL_LIBS" - else - CPPFLAGS=${_cppflags} fi - LDFLAGS=${_ldflags} fi -AC_ARG_WITH(output, -[ --with-output add the serialization support (on)]) -if test "$with_minimum" = "yes" -a "$with_output" = "" -then - with_output=no -fi -if test "$with_output" = "no" ; then - echo Disabling serialization/saving support - WITH_OUTPUT=0 -else - WITH_OUTPUT=1 -fi -AC_SUBST(WITH_OUTPUT) - -AC_ARG_WITH(tree, -[ --with-tree add the DOM like tree manipulation APIs (on)]) -if test "$with_minimum" = "yes" -a "$with_tree" = "" -then - with_tree=no -fi +dnl +dnl Tree functions +dnl if test "$with_tree" = "no" ; then echo Disabling DOM like tree manipulation APIs WITH_TREE=0 @@ -606,12 +757,6 @@ else fi AC_SUBST(WITH_TREE) -AC_ARG_WITH(ftp, -[ --with-ftp add the FTP support (on)]) -if test "$with_minimum" = "yes" -a "$with_ftp" = "" -then - with_ftp=no -fi if test "$with_ftp" = "no" ; then echo Disabling FTP support WITH_FTP=0 @@ -623,12 +768,6 @@ fi AC_SUBST(WITH_FTP) AC_SUBST(FTP_OBJ) -AC_ARG_WITH(http, -[ --with-http add the HTTP support (on)]) -if test "$with_minimum" = "yes" -a "$with_http" = "" -then - with_http=no -fi if test "$with_http" = "no" ; then echo Disabling HTTP support WITH_HTTP=0 @@ -640,12 +779,6 @@ fi AC_SUBST(WITH_HTTP) AC_SUBST(HTTP_OBJ) -AC_ARG_WITH(legacy, -[ --with-legacy add deprecated APIs for compatibility (on)]) -if test "$with_minimum" = "yes" -a "$with_legacy" = "" -then - with_legacy=no -fi if test "$with_legacy" = "no" ; then echo Disabling deprecated APIs WITH_LEGACY=0 @@ -654,12 +787,6 @@ else fi AC_SUBST(WITH_LEGACY) -AC_ARG_WITH(reader, -[ --with-reader add the xmlReader parsing interface (on)]) -if test "$with_minimum" = "yes" -a "$with_reader" = "" -then - with_reader=no -fi if test "$with_reader" = "no" ; then echo Disabling the xmlReader parsing interface WITH_READER=0 @@ -667,16 +794,33 @@ if test "$with_reader" = "no" ; then else WITH_READER=1 READER_TEST=Readertests + if test "$with_push" = "no" ; then + echo xmlReader requires Push interface - enabling it + with_push=yes + fi fi AC_SUBST(WITH_READER) AC_SUBST(READER_TEST) -AC_ARG_WITH(pattern, -[ --with-pattern add the xmlPattern selection interface (on)]) -if test "$with_minimum" = "yes" -a "$with_pattern" = "" -then - with_pattern=no +if test "$with_writer" = "no" ; then + echo Disabling the xmlWriter saving interface + WITH_WRITER=0 +# WRITER_TEST= +else + WITH_WRITER=1 +# WRITER_TEST=Writertests + if test "$with_push" = "no" ; then + echo xmlWriter requires Push interface - enabling it + with_push=yes + fi + if test "$with_output" = "no" ; then + echo xmlWriter requires Output interface - enabling it + with_output=yes + fi fi +AC_SUBST(WITH_WRITER) +#AC_SUBST(WRITER_TEST) + if test "$with_pattern" = "no" ; then echo Disabling the xmlPattern parsing interface WITH_PATTERN=0 @@ -688,29 +832,6 @@ fi AC_SUBST(WITH_PATTERN) AC_SUBST(PATTERN_TEST) -AC_ARG_WITH(writer, -[ --with-writer add the xmlWriter saving interface (on)]) -if test "$with_minimum" = "yes" -a "$with_writer" = "" -then - with_writer=no -fi -if test "$with_writer" = "no" ; then - echo Disabling the xmlWriter saving interface - WITH_WRITER=0 -# WRITER_TEST= -else - WITH_WRITER=1 -# WRITER_TEST=Writertests -fi -AC_SUBST(WITH_WRITER) -#AC_SUBST(WRITER_TEST) - -AC_ARG_WITH(sax1, -[ --with-sax1 add the older SAX1 interface (on)]) -if test "$with_minimum" = "yes" -a "$with_sax1" = "" -then - with_sax1=no -fi if test "$with_sax1" = "no" ; then echo Disabling the older SAX1 interface WITH_SAX1=0 @@ -722,12 +843,6 @@ fi AC_SUBST(WITH_SAX1) AC_SUBST(TEST_SAX) -AC_ARG_WITH(push, -[ --with-push add the PUSH parser interfaces (on)]) -if test "$with_minimum" = "yes" -a "$with_push" = "" -then - with_push=no -fi if test "$with_push" = "no" ; then echo Disabling the PUSH parser interfaces WITH_PUSH=0 @@ -739,12 +854,6 @@ fi AC_SUBST(WITH_PUSH) AC_SUBST(TEST_PUSH) -AC_ARG_WITH(html, -[ --with-html add the HTML support (on)]) -if test "$with_minimum" = "yes" -a "$with_html" = "" -then - with_html=no -fi if test "$with_html" = "no" ; then echo Disabling HTML support WITH_HTML=0 @@ -765,12 +874,6 @@ AC_SUBST(HTML_OBJ) AC_SUBST(TEST_HTML) AC_SUBST(TEST_PHTML) -AC_ARG_WITH(valid, -[ --with-valid add the DTD validation support (on)]) -if test "$with_minimum" = "yes" -a "$with_valid" = "" -then - with_valid=no -fi if test "$with_valid" = "no" ; then echo Disabling DTD validation support WITH_VALID=0 @@ -785,12 +888,6 @@ AC_SUBST(WITH_VALID) AC_SUBST(TEST_VALID) AC_SUBST(TEST_VTIME) -AC_ARG_WITH(catalog, -[ --with-catalog add the Catalog support (on)]) -if test "$with_minimum" = "yes" -a "$with_catalog" = "" -then - with_catalog=no -fi if test "$with_catalog" = "no" ; then echo Disabling Catalog support WITH_CATALOG=0 @@ -805,12 +902,6 @@ AC_SUBST(WITH_CATALOG) AC_SUBST(CATALOG_OBJ) AC_SUBST(TEST_CATALOG) -AC_ARG_WITH(docbook, -[ --with-docbook add Docbook SGML support (on)]) -if test "$with_minimum" = "yes" -a "$with_docbook" = "" -then - with_docbook=no -fi if test "$with_docbook" = "no" ; then echo Disabling Docbook support WITH_DOCB=0 @@ -823,17 +914,63 @@ AC_SUBST(WITH_DOCB) AC_SUBST(DOCB_OBJ) -AC_ARG_WITH(xpath, -[ --with-xpath add the XPATH support (on)]) -if test "$with_minimum" = "yes" -a "$with_xpath" = "" -then - with_xpath=no +if test "$with_xptr" = "no" ; then + echo Disabling XPointer support + WITH_XPTR=0 + XPTR_OBJ= + TEST_XPTR= +else + WITH_XPTR=1 + XPTR_OBJ=xpointer.o + TEST_XPTR=XPtrtests + if test "$with_xpath" = "no" ; then + echo XPointer requires XPath support - enabling it + with_xpath=yes + fi fi +AC_SUBST(WITH_XPTR) +AC_SUBST(XPTR_OBJ) +AC_SUBST(TEST_XPTR) + +if test "$with_c14n" = "no" ; then + echo Disabling C14N support + WITH_C14N=0 + C14N_OBJ= + TEST_C14N= +else + WITH_C14N=1 + C14N_OBJ="c14n.c" + TEST_C14N=C14Ntests + if test "$with_xpath" = "no" ; then + echo C14N requires XPath support - enabling it + with_xpath=yes + fi +fi +AC_SUBST(WITH_C14N) +AC_SUBST(C14N_OBJ) +AC_SUBST(TEST_C14N) + +if test "$with_xinclude" = "no" ; then + echo Disabling XInclude support + WITH_XINCLUDE=0 + XINCLUDE_OBJ= + with_xinclude="no" + TEST_XINCLUDE= +else + WITH_XINCLUDE=1 + XINCLUDE_OBJ=xinclude.o + TEST_XINCLUDE=XIncludetests + if test "$with_xpath" = "no" ; then + echo XInclude requires XPath support - enabling it + with_xpath=yes + fi +fi +AC_SUBST(WITH_XINCLUDE) +AC_SUBST(XINCLUDE_OBJ) +AC_SUBST(TEST_XINCLUDE) + if test "$with_xpath" = "no" ; then echo Disabling XPATH support - with_xptr="no" - with_c14n="no" - with_xinclude="no" WITH_XPATH=0 XPATH_OBJ= TEST_XPATH= @@ -846,74 +983,18 @@ AC_SUBST(WITH_XPATH) AC_SUBST(XPATH_OBJ) AC_SUBST(TEST_XPATH) -AC_ARG_WITH(xptr, -[ --with-xptr add the XPointer support (on)]) -if test "$with_minimum" = "yes" -a "$with_xptr" = "" -then - with_xptr=no -fi -if test "$with_xptr" = "no" ; then - echo Disabling XPointer support - WITH_XPTR=0 - XPTR_OBJ= - TEST_XPTR= +dnl +dnl output functions +dnl +if test "$with_output" = "no" ; then + echo Disabling serialization/saving support + WITH_OUTPUT=0 else - WITH_XPTR=1 - XPTR_OBJ=xpointer.o - TEST_XPTR=XPtrtests + WITH_OUTPUT=1 fi -AC_SUBST(WITH_XPTR) -AC_SUBST(XPTR_OBJ) -AC_SUBST(TEST_XPTR) - -AC_ARG_WITH(c14n, -[ --with-c14n add the Canonicalization support (on)]) -if test "$with_minimum" = "yes" -a "$with_c14n" = "" -then - with_c14n=no -fi -if test "$with_c14n" = "no" ; then - echo Disabling C14N support - WITH_C14N=0 - C14N_OBJ= - TEST_C14N= -else - WITH_C14N=1 - C14N_OBJ="c14n.c" - TEST_C14N=C14Ntests -fi -AC_SUBST(WITH_C14N) -AC_SUBST(C14N_OBJ) -AC_SUBST(TEST_C14N) - -AC_ARG_WITH(xinclude, -[ --with-xinclude add the XInclude support (on)]) -if test "$with_minimum" = "yes" -a "$with_xinclude" = "" -then - with_xinclude=no -fi -if test "$with_xinclude" = "no" ; then - echo Disabling XInclude support - WITH_XINCLUDE=0 - XINCLUDE_OBJ= - with_xinclude="no" - TEST_XINCLUDE= -else - WITH_XINCLUDE=1 - XINCLUDE_OBJ=xinclude.o - TEST_XINCLUDE=XIncludetests -fi -AC_SUBST(WITH_XINCLUDE) -AC_SUBST(XINCLUDE_OBJ) -AC_SUBST(TEST_XINCLUDE) +AC_SUBST(WITH_OUTPUT) WITH_ICONV=0 -AC_ARG_WITH(iconv, -[ --with-iconv[[=DIR]] add ICONV support (on)]) -if test "$with_minimum" = "yes" -a "$with_iconv" = "" -then - with_iconv=no -fi if test "$with_iconv" = "no" ; then echo Disabling ICONV support else @@ -964,12 +1045,6 @@ XML_LIBTOOLLIBS="libxml2.la" AC_SUBST(WITH_ICONV) WITH_ISO8859X=1 -AC_ARG_WITH(iso8859x, -[ --with-iso8859x add ISO8859X support if no iconv (on)]) -if test "$with_minimum" = "yes" -a "$with_iso8859x" = "" -then - with_iso8859x=no -fi if test "$WITH_ICONV" != "1" ; then if test "$with_iso8859x" = "no" ; then echo Disabling ISO8859X support @@ -978,14 +1053,8 @@ fi fi AC_SUBST(WITH_ISO8859X) -AC_ARG_WITH(schemas, -[ --with-schemas add Relax-NG and experimental Schemas support (on)]) -if test "$with_minimum" = "yes" -a "$with_schemas" = "" -then - with_schemas=no -fi if test "$with_schemas" = "no" ; then - echo "Disabled Schemas/Relax-NG support" + echo "Disabling Schemas/Relax-NG support" WITH_SCHEMAS=0 TEST_SCHEMAS= else @@ -1000,12 +1069,6 @@ fi AC_SUBST(WITH_SCHEMAS) AC_SUBST(TEST_SCHEMAS) -AC_ARG_WITH(regexps, -[ --with-regexps add Regular Expressions support (on)]) -if test "$with_minimum" = "yes" -a "$with_regexps" = "" -then - with_regexps=no -fi if test "$with_regexps" = "no" ; then echo Disabling Regexps support WITH_REGEXPS=0 @@ -1017,12 +1080,6 @@ fi AC_SUBST(WITH_REGEXPS) AC_SUBST(TEST_REGEXPS) -AC_ARG_WITH(debug, -[ --with-debug add the debugging module (on)]) -if test "$with_minimum" = "yes" -a "$with_debug" = "" -then - with_debug=no -fi if test "$with_debug" = "no" ; then echo Disabling DEBUG support WITH_DEBUG=0 @@ -1037,12 +1094,6 @@ AC_SUBST(WITH_DEBUG) AC_SUBST(DEBUG_OBJ) AC_SUBST(TEST_DEBUG) -AC_ARG_WITH(mem_debug, -[ --with-mem-debug add the memory debugging module (off)]) -if test "$with_minimum" = "yes" -a "$with_mem_debug" = "" -then - with_mem_debug=no -fi if test "$with_mem_debug" = "yes" ; then if test "$with_thread_alloc" = "yes" ; then echo Disabling memory debug - cannot use mem-debug with thread-alloc! @@ -1056,12 +1107,6 @@ else fi AC_SUBST(WITH_MEM_DEBUG) -AC_ARG_WITH(run_debug, -[ --with-run-debug add the runtime debugging module (off)]) -if test "$with_minimum" = "yes" -a "$with_run_debug" = "" -then - with_run_debug=no -fi if test "$with_run_debug" = "yes" ; then echo Enabling runtime debug support WITH_RUN_DEBUG=1 diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 5984f756..56fc77c3 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -219,10 +219,10 @@ A:link, A:visited, A:active { text-decoration: underline }
checking
xlinkIsLink
xmlBufferWriteQuotedString
xmlBuildURI
-xmlMemFree
xmlUTF8Strlen
checkings
xmlValidateOneElement
checks
XML_SCHEMAS_ATTRGROUP_MARKED
+XML_SCHEMAS_TYPE_MARKED
htmlAutoCloseTag
htmlIsAutoClosed
htmlNodeStatus
@@ -268,6 +268,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseInNodeContext
xmlSAXParseEntity
circular
XML_SCHEMAS_ATTRGROUP_MARKED
+XML_SCHEMAS_ELEM_CIRCULAR
+XML_SCHEMAS_TYPE_MARKED
cleanly
xmlCheckHTTPInput
cleans
xmlNanoFTPScanProxy
xmlNanoHTTPScanProxy
@@ -452,6 +454,7 @@ A:link, A:visited, A:active { text-decoration: underline }
complexType
XML_SCHEMAS_TYPE_ABSTRACT
XML_SCHEMAS_TYPE_BLOCK_DEFAULT
XML_SCHEMAS_TYPE_BLOCK_EXTENSION
+XML_SCHEMAS_TYPE_BLOCK_RESTRICTION
XML_SCHEMAS_TYPE_FINAL_EXTENSION
XML_SCHEMAS_TYPE_FINAL_RESTRICTION
XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html index 47bc9432..d1bf1a72 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -71,6 +71,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseMarkupDecl
elements
XML_CATALOGS_NAMESPACE
XML_COMPLETE_ATTRS
+XML_SCHEMAS_ATTR_GLOBAL
XML_SCHEMAS_ATTR_NSDEFAULT
XML_SCHEMAS_ELEM_NSDEFAULT
XML_SCHEMAS_QUALIF_ELEM
@@ -230,11 +231,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlListDataCompare
equivalent
xmlMallocAtomicLoc
xmlMallocLoc
-xmlMemFree
-xmlMemMalloc
-xmlMemRealloc
xmlMemStrdupLoc
-xmlMemoryStrdup
xmlNodeListGetRawString
xmlNodeListGetString
xmlReallocLoc
@@ -334,6 +331,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathNextFollowing
xmlXPathNextPreceding
exclusions
XML_SCHEMAS_ELEM_FINAL_ABSENT
+
exclusions:
XML_SCHEMAS_ELEM_FINAL_EXTENSION
+XML_SCHEMAS_ELEM_FINAL_RESTRICTION
exclusive
xmlC14NDocDumpMemory
xmlC14NDocSave
xmlC14NDocSaveTo
@@ -380,6 +379,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathNodeSetMerge
xmlXPtrLocationSetMerge
extension
XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION
+XML_SCHEMAS_ELEM_FINAL_EXTENSION
XML_SCHEMAS_FINAL_DEFAULT_EXTENSION
XML_SCHEMAS_TYPE_BLOCK_EXTENSION
XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index 5f509b08..592a2d05 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -164,7 +164,8 @@ A:link, A:visited, A:active { text-decoration: underline }
filled
xmlGetFeaturesList
fills
xmlParseURIReference
filters
xmlParseEncodingDecl
-
final
XML_SCHEMAS_TYPE_FINAL_EXTENSION
+
final
XML_SCHEMAS_TYPE_FINAL_DEFAULT
+XML_SCHEMAS_TYPE_FINAL_EXTENSION
XML_SCHEMAS_TYPE_FINAL_LIST
XML_SCHEMAS_TYPE_FINAL_RESTRICTION
XML_SCHEMAS_TYPE_FINAL_UNION
@@ -202,7 +203,8 @@ A:link, A:visited, A:active { text-decoration: underline }
fixed
XML_SCHEMAS_ATTR_FIXED
XML_SCHEMAS_ELEM_FIXED
xmlParseDefaultDecl
-
flag
htmlSetMetaEncoding
+
flag
XML_SCHEMAS_ELEM_CIRCULAR
+htmlSetMetaEncoding
initxmlDefaultSAXHandler
xmlC14NDocDumpMemory
xmlC14NDocSave
diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html index 234c3362..167b3991 100644 --- a/doc/APIchunk14.html +++ b/doc/APIchunk14.html @@ -154,6 +154,8 @@ A:link, A:visited, A:active { text-decoration: underline }
greater-than
xmlNewTextChild
group
XML_SCHEMAS_ATTRGROUP_MARKED
XML_SCHEMAS_ELEM_FINAL_ABSENT
+XML_SCHEMAS_ELEM_FINAL_EXTENSION
+XML_SCHEMAS_ELEM_FINAL_RESTRICTION
_xmlSchemaAttribute
_xmlSchemaAttributeGroup
ftpListCallback
@@ -236,6 +238,7 @@ A:link, A:visited, A:active { text-decoration: underline }
has-same-nodes
xmlXPathHasSameNodes
have
INPUT_CHUNK
XML_SCHEMAS_ATTR_INTERNAL_RESOLVED
+XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
_htmlElemDesc
htmlParseEntityRef
xmlAutomataNewAllTrans
@@ -274,6 +277,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNanoHTTPMethodRedir
xmlNanoHTTPMimeType
heading
xmlCharEncodingOutputFunc
+
helper
XML_SCHEMAS_ELEM_CIRCULAR
here
_xmlXPathContext
htmlNodeStatus
xmlParseAttValue
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 9d622fb4..de9b7eb9 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -245,10 +245,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlInitNodeInfoSeq
xmlMallocAtomicLoc
xmlMallocLoc
-xmlMemMalloc
-xmlMemRealloc
xmlMemStrdupLoc
-xmlMemoryStrdup
xmlNanoFTPList
xmlParserAddNodeInfo
xmlParserFindNodeInfo
@@ -313,9 +310,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAutomataGetInitState
xmlBufferCreateSize
xmlInitNodeInfoSeq
-xmlMemRealloc
xmlMemStrdupLoc
-xmlMemoryStrdup
xmlReallocLoc
xmlShell
xmlXPathNodeSetAdd
@@ -482,6 +477,8 @@ A:link, A:visited, A:active { text-decoration: underline }
issue
xmlEncodeEntities
issued
xlinkIsLink
item
XML_SCHEMAS_TYPE_BLOCK_DEFAULT
+XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE
+XML_SCHEMAS_TYPE_MARKED
_xmlXPathContext
xmlHashRemoveEntry
xmlHashRemoveEntry2
diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html index 6355de9d..aeb4f213 100644 --- a/doc/APIchunk16.html +++ b/doc/APIchunk16.html @@ -95,8 +95,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCharEncodingOutputFunc
xmlMallocAtomicLoc
xmlMallocLoc
-xmlMemMalloc
-xmlMemRealloc
xmlReallocLoc
lang
xmlNodeGetLang
xmlXPathLangFunction
@@ -327,10 +325,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlUnlockLibrary
logging
xmlMallocAtomicLoc
xmlMallocLoc
-xmlMemMalloc
-xmlMemRealloc
xmlMemStrdupLoc
-xmlMemoryStrdup
xmlReallocLoc
long
IS_BASECHAR
IS_COMBINING
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index d834fe5b..19023127 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -60,7 +60,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlMallocFunc
xmlMallocLoc
xmlMemGet
-xmlMemMalloc
xmlMemSetup
mallocAtomicFunc
xmlGcMemGet
xmlGcMemSetup
@@ -80,6 +79,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStrdup
xmlTextReaderQuoteChar
marked
XML_SCHEMAS_ATTRGROUP_MARKED
+XML_SCHEMAS_TYPE_MARKED
_xmlParserInput
marker
xmlDecodeEntities
xmlStringDecodeEntities
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index c594cabd..5ed655af 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -66,7 +66,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
occurred
xmlMemStrdupLoc
-xmlMemoryStrdup
occurrence
xmlStrcasestr
xmlStrchr
xmlStrstr
@@ -236,6 +235,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSaveToFilename
xmlSaveToIO
xmlSchemaSetValidOptions
+xmlSchemaValidCtxtGetOptions
ordered
xmlListAppend
xmlListInsert
xmlXPathNextAncestor
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index 0c0c17ec..a2fc5358 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -332,7 +332,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSAXDefaultVersion
xmlSubstituteEntitiesDefault
xmlXPathAxisFunc
-
primitive
xmlXPathConvertFunc
+
primitive
XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE
+xmlXPathConvertFunc
print
xmlShellPrintNode
xmlSnprintfElementContent
xmlSprintfElementContent
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html index 9ae366cc..c2f0e934 100644 --- a/doc/APIchunk21.html +++ b/doc/APIchunk21.html @@ -119,7 +119,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlGcMemGet
xmlGcMemSetup
xmlMemGet
-xmlMemRealloc
xmlMemSetup
xmlReallocFunc
xmlReallocLoc
@@ -223,6 +222,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRMutexLock
xmlRMutexUnlock
ref
XML_SCHEMAS_ATTR_INTERNAL_RESOLVED
+XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
_xmlEntity
xmlAddRef
xmlFreeRefTable
@@ -231,6 +231,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlLinkGetData
xmlParseAttValue
references
XML_SCHEMAS_ATTR_INTERNAL_RESOLVED
+XML_SCHEMAS_ELEM_CIRCULAR
+XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
htmlParseEntityRef
xmlGetRefs
xmlLoadSGMLSuperCatalog
@@ -459,6 +461,7 @@ A:link, A:visited, A:active { text-decoration: underline }
resolveEntity
resolveEntity
resolveEntitySAXFunc
resolved
XML_SCHEMAS_ATTR_INTERNAL_RESOLVED
+XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
xmlTextReaderLookupNamespace
resolver
xmlGetExternalEntityLoader
xmlSetExternalEntityLoader
@@ -485,7 +488,9 @@ A:link, A:visited, A:active { text-decoration: underline }
restrict
xmlParseExternalID
restriction
XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION
XML_SCHEMAS_ELEM_BLOCK_RESTRICTION
+XML_SCHEMAS_ELEM_FINAL_RESTRICTION
XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION
+XML_SCHEMAS_TYPE_BLOCK_RESTRICTION
XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION
XML_SCHEMAS_TYPE_FINAL_RESTRICTION
results
xmlXPathEqualValues
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index d24cc921..8906215b 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -134,7 +134,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextReaderXmlLang
scoping
xmlNewGlobalNs
script
htmlIsScriptAttribute
-
search
_xmlXPathAxis
+
search
XML_SCHEMAS_ELEM_CIRCULAR
+_xmlXPathAxis
xmlCharInRange
xmlGetDtdAttrDesc
xmlGetDtdElementDesc
@@ -313,7 +314,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewMutex
xmlSchemaGetBuiltInListSimpleTypeItemType
xmlSchemaValidateListSimpleTypeFacet
-
simpleType
XML_SCHEMAS_TYPE_FINAL_LIST
+
simpleType
XML_SCHEMAS_TYPE_FINAL_DEFAULT
+XML_SCHEMAS_TYPE_FINAL_LIST
XML_SCHEMAS_TYPE_FINAL_RESTRICTION
XML_SCHEMAS_TYPE_FINAL_UNION
XML_SCHEMAS_TYPE_VARIETY_ABSENT
@@ -464,8 +466,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextReaderStandalone
specifying
xmlMallocAtomicLoc
xmlMallocLoc
-xmlMemMalloc
-xmlMemRealloc
xmlReallocLoc
speed
xmlXPathOrderDocElems
speedup
xmlTextReaderConstString
@@ -602,7 +602,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlMemGet
xmlMemSetup
xmlMemStrdupLoc
-xmlMemoryStrdup
xmlStrdup
xmlStrdupFunc
stream
_xmlParserCtxt
@@ -691,6 +690,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNodeGetContent
xmlParseEntityValue
substituting
xmlSubstituteEntitiesDefault
+
substitutionGroup
XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
substitutions
XML_SCHEMAS_ELEM_BLOCK_EXTENSION
xmlStringDecodeEntities
xmlStringLenDecodeEntities
diff --git a/doc/APIchunk3.html b/doc/APIchunk3.html index 5cfc55d5..3534a942 100644 --- a/doc/APIchunk3.html +++ b/doc/APIchunk3.html @@ -124,36 +124,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCharEncOutFunc
GeometricShapes
xmlUCSIsGeometricShapes
Georgian
xmlUCSIsGeorgian
-
Get
getEntity
-getEntitySAXFunc
-getNamespace
-getParameterEntity
-getParameterEntitySAXFunc
-xlinkGetDefaultDetect
-xlinkGetDefaultHandler
-xmlCtxtGetLastError
-xmlDocGetRootElement
-xmlGetExternalEntityLoader
-xmlGetIntSubset
-xmlGetLastError
-xmlGetLineNo
-xmlListEnd
-xmlListFront
-xmlListSize
-xmlNanoFTPGetResponse
-xmlNanoHTTPAuthHeader
-xmlNanoHTTPReturnCode
-xmlRelaxNGGetParserErrors
-xmlRelaxNGGetValidErrors
-xmlSAX2GetEntity
-xmlSAX2GetParameterEntity
-xmlSchemaGetParserErrors
-xmlSchemaGetValidErrors
-xmlTextReaderConstString
-xmlTextReaderNodeType
-xmlXPathGetContextNode
-xmlXPathGetDocument
-xmlXPathGetError
Gets
xmlTextReaderReadState
Gives
xmlSchemaGetBuiltInType
Global
_xmlDoc
diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html index 2e87e6fc..01ebe7c9 100644 --- a/doc/APIchunk4.html +++ b/doc/APIchunk4.html @@ -120,6 +120,8 @@ A:link, A:visited, A:active { text-decoration: underline }
Maps
xmlChildrenNode
xmlRootNode
Marks
XML_SCHEMAS_ATTRGROUP_MARKED
+XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE
+XML_SCHEMAS_TYPE_MARKED
Markup
xmlParseExternalSubset
xmlParseMarkupDecl
Match
xmlParseElement
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html index 2ad95a3a..7ad580a1 100644 --- a/doc/APIchunk8.html +++ b/doc/APIchunk8.html @@ -232,6 +232,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSetDocCompressMode

Letter a:

a-z
xmlCheckLanguageID
xmlURIEscapeStr
+
a-zA-Z
IS_ASCII_LETTER
a-zA-Z0-9
IS_PUBIDCHAR
a-zA-Z0-9_
xmlParseVersionNum
a@b
xmlNanoFTPProxy
@@ -428,8 +429,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlBuildQName
xmlMallocAtomicLoc
xmlMallocLoc
-xmlMemMalloc
-xmlMemRealloc
xmlNewMutex
xmlNewRMutex
xmlReallocLoc
@@ -438,10 +437,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlGetBufferAllocationScheme
xmlMallocAtomicLoc
xmlMallocLoc
-xmlMemMalloc
-xmlMemRealloc
xmlMemStrdupLoc
-xmlMemoryStrdup
xmlNormalizeURIPath
xmlReallocLoc
xmlSetBufferAllocationScheme
@@ -453,7 +449,8 @@ A:link, A:visited, A:active { text-decoration: underline }
allocator
DEBUG_MEMORY
allocators
xmlGcMemGet
xmlGcMemSetup
-
allow
XML_SCHEMAS_ATTR_NSDEFAULT
+
allow
XML_SCHEMAS_ATTR_GLOBAL
+XML_SCHEMAS_ATTR_NSDEFAULT
XML_SCHEMAS_ELEM_NSDEFAULT
docbCreatePushParserCtxt
htmlAttrAllowed
@@ -641,8 +638,6 @@ A:link, A:visited, A:active { text-decoration: underline }
area
xmlBufferCreateStatic
xmlMallocAtomicLoc
xmlMallocLoc
-xmlMemMalloc
-xmlMemRealloc
xmlParserInputBufferCreateMem
xmlParserInputBufferCreateStatic
xmlReallocLoc
diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html index abfd6de2..1a334f47 100644 --- a/doc/APIchunk9.html +++ b/doc/APIchunk9.html @@ -247,7 +247,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaGetBuiltInType
xmlSchemaIsBuiltInTypeFacet
xmlSchemaValidateLengthFacet
-
builtin
initGenericErrorDefaultFunc
+
builtin
XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE
+initGenericErrorDefaultFunc
bunch
xmlParseNamespace
bypass
xmlParseCatalogFile

A-B diff --git a/doc/apibuild.py b/doc/apibuild.py index 2cbf32ff..bcc14638 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -297,11 +297,18 @@ class index: def merge_public(self, idx): for id in idx.functions.keys(): if self.functions.has_key(id): + # check that function condition agrees with header + if idx.functions[id].conditionals != \ + self.functions[id].conditionals: + print "Header condition differs from Function for %s:" \ + % id + print " H: %s" % self.functions[id].conditionals + print " C: %s" % idx.functions[id].conditionals up = idx.functions[id] self.functions[id].update(None, up.type, up.info, up.extra) # else: # print "Function %s from %s is not declared in headers" % ( - # id, idx.functions[id].module) + # id, idx.functions[id].module) # TODO: do the same for variables. def analyze_dict(self, type, dict): @@ -814,12 +821,12 @@ class CParser: i = 0 while i < nbargs: if args[i][2] == None and args[i][0] != "void" and args[i][1] != None: - self.warning("Function comment for %s lack description of arg %s" % (name, args[i][1])) + self.warning("Function comment for %s lacks description of arg %s" % (name, args[i][1])) i = i + 1 if retdesc == "" and ret[0] != "void": - self.warning("Function comment for %s lack description of return value" % (name)) + self.warning("Function comment for %s lacks description of return value" % (name)) if desc == "": - self.warning("Function comment for %s lack description of the function" % (name)) + self.warning("Function comment for %s lacks description of the function" % (name)) return(((ret[0], retdesc), args, desc)) @@ -858,22 +865,61 @@ class CParser: self.index_add(name, self.filename, not self.is_header, "macro", info) return token - if (name == "#ifdef" or name == "#ifndef") and self.is_header: + + # + # Processing of conditionals modified by Bill 1/1/05 + # + # We process conditionals (i.e. tokens from #ifdef, #ifndef, + # #if, #else and #endif) for headers and mainline code, + # store the ones from the header in libxml2-api.xml, and later + # (in the routine merge_public) verify that the two (header and + # mainline code) agree. + # + # There is a small problem with processing the headers. Some of + # the variables are not concerned with enabling / disabling of + # library functions (e.g. '__XML_PARSER_H__'), and we don't want + # them to be included in libxml2-api.xml, or involved in + # the check between the header and the mainline code. To + # accomplish this, we ignore any conditional which doesn't include + # the string 'ENABLED' + # + if name == "#ifdef": + apstr = self.lexer.tokens[0][1] try: - self.defines.append(self.lexer.tokens[0][1]) - if string.find(self.lexer.tokens[0][1], 'ENABLED') != -1: - self.conditionals.append(self.lexer.tokens[0][1]) -# print self.conditionals -# print self.defines + self.defines.append(apstr) + if string.find(apstr, 'ENABLED') != -1: + self.conditionals.append("defined(%s)" % apstr) except: pass - if name == "#endif" and self.is_header: - if self.conditionals != [] and self.defines != [] and \ - self.defines[-1] == self.conditionals[-1]: + elif name == "#ifndef": + apstr = self.lexer.tokens[0][1] + try: + self.defines.append(apstr) + if string.find(apstr, 'ENABLED') != -1: + self.conditionals.append("!defined(%s)" % apstr) + except: + pass + elif name == "#if": + apstr = "" + for tok in self.lexer.tokens: + if apstr != "": + apstr = apstr + " " + apstr = apstr + tok[1] + try: + self.defines.append(apstr) + if string.find(apstr, 'ENABLED') != -1: + self.conditionals.append(apstr) + except: + pass + elif name == "#else": + if self.conditionals != [] and \ + string.find(self.defines[-1], 'ENABLED') != -1: + self.conditionals[-1] = "!(%s)" % self.conditionals[-1] + elif name == "#endif": + if self.conditionals != [] and \ + string.find(self.defines[-1], 'ENABLED') != -1: self.conditionals = self.conditionals[:-1] self.defines = self.defines[:-1] -# print self.defines -# print self.conditionals token = self.lexer.token() while token != None and token[0] == 'preproc' and \ token[1][0] != '#': @@ -1642,9 +1688,16 @@ class docBuilder: output.write(" <%s name='%s' file='%s'>\n" % (id.type, name, self.modulename_file(id.module))) + # + # Processing of conditionals modified by Bill 1/1/05 + # if id.conditionals != None: + apstr = "" for cond in id.conditionals: - output.write(" %s\n"% (cond)); + if apstr != "": + apstr = apstr + " && " + apstr = apstr + cond + output.write(" %s\n"% (apstr)); try: (ret, params, desc) = id.info output.write(" %s\n" % (escape(desc))) diff --git a/doc/elfgcchack.xsl b/doc/elfgcchack.xsl index 109ce0c6..33cc2556 100644 --- a/doc/elfgcchack.xsl +++ b/doc/elfgcchack.xsl @@ -108,7 +108,7 @@ extern __typeof (__xmlGenericErrorContext) __xmlGenericErrorContext __attribute( - #ifdef + #if diff --git a/doc/examples/tree2.c b/doc/examples/tree2.c index 3ab21793..c40fc55d 100644 --- a/doc/examples/tree2.c +++ b/doc/examples/tree2.c @@ -12,7 +12,7 @@ #include #include -#ifdef LIBXML_TREE_ENABLED +#if defined(LIBXML_TREE_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) /* *To compile this file using gcc you can type diff --git a/doc/examples/xpath1.c b/doc/examples/xpath1.c index f014b7b3..be1dd2aa 100644 --- a/doc/examples/xpath1.c +++ b/doc/examples/xpath1.c @@ -18,7 +18,7 @@ #include #include -#ifdef LIBXML_XPATH_ENABLED +#if defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_SAX1_ENABLED) void usage(const char *name); diff --git a/doc/examples/xpath2.c b/doc/examples/xpath2.c index 70e5e615..eee771a1 100644 --- a/doc/examples/xpath2.c +++ b/doc/examples/xpath2.c @@ -18,7 +18,8 @@ #include #include -#ifdef LIBXML_XPATH_ENABLED +#if defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_SAX1_ENABLED) && \ + defined(LIBXML_OUTPUT_ENABLED) static void usage(const char *name); diff --git a/doc/html/book1.html b/doc/html/book1.html index a6b96d08..375dbfea 100644 --- a/doc/html/book1.html +++ b/doc/html/book1.html @@ -10,4 +10,4 @@ A:link, A:visited, A:active { text-decoration: underline } Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionnary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

+ Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionnary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: Chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

diff --git a/doc/html/index.html b/doc/html/index.html index a6b96d08..375dbfea 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -10,4 +10,4 @@ A:link, A:visited, A:active { text-decoration: underline } Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionnary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

+ Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionnary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: Chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

diff --git a/doc/html/libxml-DOCBparser.html b/doc/html/libxml-DOCBparser.html index b072e7ab..93a658cb 100644 --- a/doc/html/libxml-DOCBparser.html +++ b/doc/html/libxml-DOCBparser.html @@ -10,25 +10,35 @@ A:link, A:visited, A:active { text-decoration: underline } Module DOCBparser from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Module DOCBparser from libxml2

API Menu
API Indexes
Related links
UpAPI documentationHomeThe XML C parser and toolkit of GnomeHTMLparserNext

This module is deprecated

interface for a DocBook SGML non-verifying parser This code is DEPRECATED, and should not be used anymore.

Table of Contents

Typedef xmlParserInput docbParserInput
-
Typedef xmlParserInputPtr docbParserInputPtr
+    Module DOCBparser from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo
Module DOCBparser from libxml2
API Menu
API Indexes
Related links
UpAPI documentationHomeThe XML C parser and toolkit of GnomeHTMLparserNext
This module is deprecated
interface for a DocBook SGML non-verifying parser This code is DEPRECATED, and should not be used anymore. 
Table of Contents
Typedef xmlParserInputPtr docbParserInputPtr
 
Typedef xmlParserCtxt docbParserCtxt
 
Typedef xmlParserCtxtPtr docbParserCtxtPtr
+
Typedef xmlParserInput docbParserInput
 
Typedef xmlDocPtr docbDocPtr
 
Typedef xmlSAXHandler docbSAXHandler
 
Typedef xmlSAXHandlerPtr docbSAXHandlerPtr
-
docbParserCtxtPtr	docbCreatePushParserCtxt	(docbSAXHandlerPtr sax, 
							 void * user_data, 
							 const char * chunk, 
							 int size, 
							 const char * filename, 
							 xmlCharEncoding enc)

+
void	docbFreeParserCtxt		(docbParserCtxtPtr ctxt)

+
docbDocPtr	docbParseDoc		(xmlChar * cur, 
					 const char * encoding)

+
docbParserCtxtPtr	docbCreateFileParserCtxt	(const char * filename, 
							 const char * encoding)

+
docbDocPtr	docbSAXParseFile	(const char * filename, 
					 const char * encoding, 
					 docbSAXHandlerPtr sax, 
					 void * userData)

+
docbDocPtr	docbSAXParseDoc		(xmlChar * cur, 
					 const char * encoding, 
					 docbSAXHandlerPtr sax, 
					 void * userData)

+
docbParserCtxtPtr	docbCreatePushParserCtxt	(docbSAXHandlerPtr sax, 
							 void * user_data, 
							 const char * chunk, 
							 int size, 
							 const char * filename, 
							 xmlCharEncoding enc)

 
int	docbEncodeEntities		(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen, 
					 int quoteChar)

 
docbDocPtr	docbParseFile		(const char * filename, 
					 const char * encoding)

 
int	docbParseDocument		(docbParserCtxtPtr ctxt)

-
docbParserCtxtPtr	docbCreateFileParserCtxt	(const char * filename, 
							 const char * encoding)

-
docbDocPtr	docbParseDoc		(xmlChar * cur, 
					 const char * encoding)

-
docbDocPtr	docbSAXParseDoc		(xmlChar * cur, 
					 const char * encoding, 
					 docbSAXHandlerPtr sax, 
					 void * userData)

-
docbDocPtr	docbSAXParseFile	(const char * filename, 
					 const char * encoding, 
					 docbSAXHandlerPtr sax, 
					 void * userData)

 
int	docbParseChunk			(docbParserCtxtPtr ctxt, 
					 const char * chunk, 
					 int size, 
					 int terminate)

-
void	docbFreeParserCtxt		(docbParserCtxtPtr ctxt)

 
Description

-
Function: docbCreatePushParserCtxt
docbParserCtxtPtr	docbCreatePushParserCtxt	(docbSAXHandlerPtr sax, 
							 void * user_data, 
							 const char * chunk, 
							 int size, 
							 const char * filename, 
							 xmlCharEncoding enc)

+
Function: docbFreeParserCtxt
void	docbFreeParserCtxt		(docbParserCtxtPtr ctxt)

+
Free all the memory used by a parser context. However the parsed document in ctxt->myDoc is not freed.

+
ctxt:an SGML parser context
Function: docbParseDoc
docbDocPtr	docbParseDoc		(xmlChar * cur, 
					 const char * encoding)

+
parse an SGML in-memory document and build a tree.

+
cur:a pointer to an array of xmlChar
encoding:a free form C string describing the SGML document encoding, or NULL
Returns:the resulting document tree
Function: docbCreateFileParserCtxt
docbParserCtxtPtr	docbCreateFileParserCtxt	(const char * filename, 
							 const char * encoding)

+
Create a parser context for a file content. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.

+
filename:the filename
encoding:the SGML document encoding, or NULL
Returns:the new parser context or NULL
Function: docbSAXParseFile
docbDocPtr	docbSAXParseFile	(const char * filename, 
					 const char * encoding, 
					 docbSAXHandlerPtr sax, 
					 void * userData)

+
parse an SGML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.

+
filename:the filename
encoding:a free form C string describing the SGML document encoding, or NULL
sax:the SAX handler block
userData:if using SAX, this pointer will be provided on callbacks.
Returns:the resulting document tree
Function: docbSAXParseDoc
docbDocPtr	docbSAXParseDoc		(xmlChar * cur, 
					 const char * encoding, 
					 docbSAXHandlerPtr sax, 
					 void * userData)

+
parse an SGML in-memory document and build a tree. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.

+
cur:a pointer to an array of xmlChar
encoding:a free form C string describing the SGML document encoding, or NULL
sax:the SAX handler block
userData:if using SAX, this pointer will be provided on callbacks.
Returns:the resulting document tree
Function: docbCreatePushParserCtxt
docbParserCtxtPtr	docbCreatePushParserCtxt	(docbSAXHandlerPtr sax, 
							 void * user_data, 
							 const char * chunk, 
							 int size, 
							 const char * filename, 
							 xmlCharEncoding enc)

 
Create a parser context for using the DocBook SGML parser in push mode To allow content encoding detection, @size should be >= 4 The value of @filename is used for fetching external entities and error/warning reports.

 
sax:a SAX handler
user_data:The user data returned on SAX callbacks
chunk:a pointer to an array of chars
size:number of chars in the array
filename:an optional file name or URI
enc:an optional encoding
Returns:the new parser context or NULL
Function: docbEncodeEntities
int	docbEncodeEntities		(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen, 
					 int quoteChar)

 
Take a block of UTF-8 chars in and try to convert it to an ASCII plus SGML entities block of chars out.

@@ -36,16 +46,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 
parse a Docbook SGML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.

 
filename:the filename
encoding:a free form C string describing document encoding, or NULL
Returns:the resulting document tree
Function: docbParseDocument
int	docbParseDocument		(docbParserCtxtPtr ctxt)

 
parse an SGML document (and build a tree if using the standard SAX interface).

-
ctxt:an SGML parser context
Returns:0, -1 in case of error. the parser context is augmented as a result of the parsing.
Function: docbCreateFileParserCtxt
docbParserCtxtPtr	docbCreateFileParserCtxt	(const char * filename, 
							 const char * encoding)

-
Create a parser context for a file content. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.

-
filename:the filename
encoding:the SGML document encoding, or NULL
Returns:the new parser context or NULL
Function: docbParseDoc
docbDocPtr	docbParseDoc		(xmlChar * cur, 
					 const char * encoding)

-
parse an SGML in-memory document and build a tree.

-
cur:a pointer to an array of xmlChar
encoding:a free form C string describing the SGML document encoding, or NULL
Returns:the resulting document tree
Function: docbSAXParseDoc
docbDocPtr	docbSAXParseDoc		(xmlChar * cur, 
					 const char * encoding, 
					 docbSAXHandlerPtr sax, 
					 void * userData)

-
parse an SGML in-memory document and build a tree. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.

-
cur:a pointer to an array of xmlChar
encoding:a free form C string describing the SGML document encoding, or NULL
sax:the SAX handler block
userData:if using SAX, this pointer will be provided on callbacks.
Returns:the resulting document tree
Function: docbSAXParseFile
docbDocPtr	docbSAXParseFile	(const char * filename, 
					 const char * encoding, 
					 docbSAXHandlerPtr sax, 
					 void * userData)

-
parse an SGML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.

-
filename:the filename
encoding:a free form C string describing the SGML document encoding, or NULL
sax:the SAX handler block
userData:if using SAX, this pointer will be provided on callbacks.
Returns:the resulting document tree
Function: docbParseChunk
int	docbParseChunk			(docbParserCtxtPtr ctxt, 
					 const char * chunk, 
					 int size, 
					 int terminate)

+
ctxt:an SGML parser context
Returns:0, -1 in case of error. the parser context is augmented as a result of the parsing.
Function: docbParseChunk
int	docbParseChunk			(docbParserCtxtPtr ctxt, 
					 const char * chunk, 
					 int size, 
					 int terminate)

 
Parse a Chunk of memory

-
ctxt:an XML parser context
chunk:an char array
size:the size in byte of the chunk
terminate:last chunk indicator
Returns:zero if no error, the xmlParserErrors otherwise.
Function: docbFreeParserCtxt
void	docbFreeParserCtxt		(docbParserCtxtPtr ctxt)

-
Free all the memory used by a parser context. However the parsed document in ctxt->myDoc is not freed.

-
ctxt:an SGML parser context
Daniel Veillard

+
ctxt:an XML parser context
chunk:an char array
size:the size in byte of the chunk
terminate:last chunk indicator
Returns:zero if no error, the xmlParserErrors otherwise.

Daniel Veillard

diff --git a/doc/html/libxml-SAX.html b/doc/html/libxml-SAX.html index c4c2821c..ed8b81cb 100644 --- a/doc/html/libxml-SAX.html +++ b/doc/html/libxml-SAX.html @@ -10,113 +10,113 @@ A:link, A:visited, A:active { text-decoration: underline } Module SAX from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Module SAX from libxml2

API Menu
API Indexes
Related links
PrevHTMLtreeUpAPI documentationHomeThe XML C parser and toolkit of GnomeSAX2Next

This module is deprecated

DEPRECATED set of SAX version 1 interfaces used to build the DOM tree.

Table of Contents

void	cdataBlock			(void * ctx, 
					 const xmlChar * value, 
					 int len)
-
void	comment			(void * ctx, 
					 const xmlChar * value)
+ Module SAX from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Module SAX from libxml2

API Menu
API Indexes
Related links
PrevHTMLtreeUpAPI documentationHomeThe XML C parser and toolkit of GnomeSAX2Next

This module is deprecated

DEPRECATED set of SAX version 1 interfaces used to build the DOM tree.

Table of Contents

void	comment			(void * ctx, 
					 const xmlChar * value)
int	checkNamespace			(void * ctx, 
					 xmlChar * namespace)
-
void	startElement			(void * ctx, 
					 const xmlChar * fullname, 
					 const xmlChar ** atts)
-
void	inithtmlDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr)
int	getColumnNumber			(void * ctx)
-
void	endElement			(void * ctx, 
					 const xmlChar * name)
+
void	entityDecl			(void * ctx, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId, 
					 xmlChar * content)
void	attribute			(void * ctx, 
					 const xmlChar * fullname, 
					 const xmlChar * value)
-
void	namespaceDecl			(void * ctx, 
					 const xmlChar * href, 
					 const xmlChar * prefix)
xmlNsPtr	getNamespace		(void * ctx)
-
void	initdocbDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr)
void	setDocumentLocator		(void * ctx, 
					 xmlSAXLocatorPtr loc)
+
void	initxmlDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr, 
					 int warning)
+
void	ignorableWhitespace		(void * ctx, 
					 const xmlChar * ch, 
					 int len)
+
int	hasExternalSubset		(void * ctx)
+
void	unparsedEntityDecl		(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId, 
					 const xmlChar * notationName)
+
void	globalNamespace			(void * ctx, 
					 const xmlChar * href, 
					 const xmlChar * prefix)
+
int	hasInternalSubset		(void * ctx)
+
void	reference			(void * ctx, 
					 const xmlChar * name)
+
void	notationDecl			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId)
+
const xmlChar *	getSystemId		(void * ctx)
+
void	externalSubset			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)
+
xmlParserInputPtr	resolveEntity	(void * ctx, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId)
+
void	startDocument			(void * ctx)
+
void	setNamespace			(void * ctx, 
					 const xmlChar * name)
+
void	cdataBlock			(void * ctx, 
					 const xmlChar * value, 
					 int len)
const xmlChar *	getPublicId		(void * ctx)
+
void	inithtmlDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr)
+
void	processingInstruction		(void * ctx, 
					 const xmlChar * target, 
					 const xmlChar * data)
+
void	endElement			(void * ctx, 
					 const xmlChar * name)
+
void	namespaceDecl			(void * ctx, 
					 const xmlChar * href, 
					 const xmlChar * prefix)
+
void	initdocbDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr)
xmlEntityPtr	getEntity		(void * ctx, 
					 const xmlChar * name)
void	characters			(void * ctx, 
					 const xmlChar * ch, 
					 int len)
void	elementDecl			(void * ctx, 
					 const xmlChar * name, 
					 int type, 
					 xmlElementContentPtr content)
-
void	ignorableWhitespace		(void * ctx, 
					 const xmlChar * ch, 
					 int len)
-
int	hasExternalSubset		(void * ctx)
-
int	isStandalone			(void * ctx)
-
void	unparsedEntityDecl		(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId, 
					 const xmlChar * notationName)
-
void	reference			(void * ctx, 
					 const xmlChar * name)
-
void	globalNamespace			(void * ctx, 
					 const xmlChar * href, 
					 const xmlChar * prefix)
-
void	initxmlDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr, 
					 int warning)
-
int	hasInternalSubset		(void * ctx)
-
void	processingInstruction		(void * ctx, 
					 const xmlChar * target, 
					 const xmlChar * data)
+
void	startElement			(void * ctx, 
					 const xmlChar * fullname, 
					 const xmlChar ** atts)
xmlEntityPtr	getParameterEntity	(void * ctx, 
					 const xmlChar * name)
void	attributeDecl			(void * ctx, 
					 const xmlChar * elem, 
					 const xmlChar * fullname, 
					 int type, 
					 int def, 
					 const xmlChar * defaultValue, 
					 xmlEnumerationPtr tree)
-
void	notationDecl			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId)
-
void	entityDecl			(void * ctx, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId, 
					 xmlChar * content)
-
void	setNamespace			(void * ctx, 
					 const xmlChar * name)
-
void	externalSubset			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)
-
xmlParserInputPtr	resolveEntity	(void * ctx, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId)
-
const xmlChar *	getSystemId		(void * ctx)
-
void	startDocument			(void * ctx)
+
int	isStandalone			(void * ctx)
void	internalSubset			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)
void	endDocument			(void * ctx)
int	getLineNumber			(void * ctx)

Description

-

Function: cdataBlock

void	cdataBlock			(void * ctx, 
					 const xmlChar * value, 
					 int len)

-

called when a pcdata block has been parsed DEPRECATED: use xmlSAX2CDataBlock()

-
ctx:the user data (XML parser context)
value:The pcdata content
len:the block length

Function: comment

void	comment			(void * ctx, 
					 const xmlChar * value)

+
Function: comment
void	comment			(void * ctx, 
					 const xmlChar * value)

 
A comment has been parsed. DEPRECATED: use xmlSAX2Comment()

 
ctx:the user data (XML parser context)
value:the comment content
Function: checkNamespace
int	checkNamespace			(void * ctx, 
					 xmlChar * namespace)

 
Check that the current element namespace is the same as the one read upon parsing. DEPRECATED

-
ctx:the user data (XML parser context)
namespace:the namespace to check against
Returns:1 if true 0 otherwise
Function: startElement
void	startElement			(void * ctx, 
					 const xmlChar * fullname, 
					 const xmlChar ** atts)

-
called when an opening tag has been processed. DEPRECATED: use xmlSAX2StartElement()

-
ctx:the user data (XML parser context)
fullname:The element name, including namespace prefix
atts:An array of name/value attributes pairs, NULL terminated
Function: inithtmlDefaultSAXHandler
void	inithtmlDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr)

-
Initialize the default HTML SAX version 1 handler DEPRECATED: use xmlSAX2InitHtmlDefaultSAXHandler() for the new SAX2 blocks

-
hdlr:the SAX handler
Function: getColumnNumber
int	getColumnNumber			(void * ctx)

+
ctx:the user data (XML parser context)
namespace:the namespace to check against
Returns:1 if true 0 otherwise
Function: getColumnNumber
int	getColumnNumber			(void * ctx)

 
Provide the column number of the current parsing point. DEPRECATED: use xmlSAX2GetColumnNumber()

-
ctx:the user data (XML parser context)
Returns:an int
Function: endElement
void	endElement			(void * ctx, 
					 const xmlChar * name)

-
called when the end of an element has been detected. DEPRECATED: use xmlSAX2EndElement()

-
ctx:the user data (XML parser context)
name:The element name
Function: attribute
void	attribute			(void * ctx, 
					 const xmlChar * fullname, 
					 const xmlChar * value)

+
ctx:the user data (XML parser context)
Returns:an int
Function: entityDecl
void	entityDecl			(void * ctx, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId, 
					 xmlChar * content)

+
An entity definition has been parsed DEPRECATED: use xmlSAX2EntityDecl()

+
ctx:the user data (XML parser context)
name:the entity name
type:the entity type
publicId:The public ID of the entity
systemId:The system ID of the entity
content:the entity value (without processing).
Function: attribute
void	attribute			(void * ctx, 
					 const xmlChar * fullname, 
					 const xmlChar * value)

 
Handle an attribute that has been read by the parser. The default handling is to convert the attribute into an DOM subtree and past it in a new xmlAttr element added to the element. DEPRECATED: use xmlSAX2Attribute()

-
ctx:the user data (XML parser context)
fullname:The attribute name, including namespace prefix
value:The attribute value
Function: namespaceDecl
void	namespaceDecl			(void * ctx, 
					 const xmlChar * href, 
					 const xmlChar * prefix)

-
A namespace has been parsed. DEPRECATED

-
ctx:the user data (XML parser context)
href:the namespace associated URN
prefix:the namespace prefix
Function: getNamespace
xmlNsPtr	getNamespace		(void * ctx)

+
ctx:the user data (XML parser context)
fullname:The attribute name, including namespace prefix
value:The attribute value
Function: getNamespace
xmlNsPtr	getNamespace		(void * ctx)

 
Get the current element namespace. DEPRECATED

-
ctx:the user data (XML parser context)
Returns:the xmlNsPtr or NULL if none
Function: initdocbDefaultSAXHandler
void	initdocbDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr)

-
Initialize the default DocBook SAX version 1 handler DEPRECATED: use xmlSAX2InitDocbDefaultSAXHandler() for the new SAX2 blocks

-
hdlr:the SAX handler
Function: setDocumentLocator
void	setDocumentLocator		(void * ctx, 
					 xmlSAXLocatorPtr loc)

+
ctx:the user data (XML parser context)
Returns:the xmlNsPtr or NULL if none
Function: setDocumentLocator
void	setDocumentLocator		(void * ctx, 
					 xmlSAXLocatorPtr loc)

 
Receive the document locator at startup, actually xmlDefaultSAXLocator Everything is available on the context, so this is useless in our case. DEPRECATED

-
ctx:the user data (XML parser context)
loc:A SAX Locator
Function: getPublicId
const xmlChar *	getPublicId		(void * ctx)

+
ctx:the user data (XML parser context)
loc:A SAX Locator
Function: initxmlDefaultSAXHandler
void	initxmlDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr, 
					 int warning)

+
Initialize the default XML SAX version 1 handler DEPRECATED: use xmlSAX2InitDefaultSAXHandler() for the new SAX2 blocks

+
hdlr:the SAX handler
warning:flag if non-zero sets the handler warning procedure
Function: ignorableWhitespace
void	ignorableWhitespace		(void * ctx, 
					 const xmlChar * ch, 
					 int len)

+
receiving some ignorable whitespaces from the parser. UNUSED: by default the DOM building will use characters DEPRECATED: use xmlSAX2IgnorableWhitespace()

+
ctx:the user data (XML parser context)
ch:a xmlChar string
len:the number of xmlChar
Function: hasExternalSubset
int	hasExternalSubset		(void * ctx)

+
Does this document has an external subset DEPRECATED: use xmlSAX2HasExternalSubset()

+
ctx:the user data (XML parser context)
Returns:1 if true
Function: unparsedEntityDecl
void	unparsedEntityDecl		(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId, 
					 const xmlChar * notationName)

+
What to do when an unparsed entity declaration is parsed DEPRECATED: use xmlSAX2UnparsedEntityDecl()

+
ctx:the user data (XML parser context)
name:The name of the entity
publicId:The public ID of the entity
systemId:The system ID of the entity
notationName:the name of the notation
Function: globalNamespace
void	globalNamespace			(void * ctx, 
					 const xmlChar * href, 
					 const xmlChar * prefix)

+
An old global namespace has been parsed. DEPRECATED

+
ctx:the user data (XML parser context)
href:the namespace associated URN
prefix:the namespace prefix
Function: hasInternalSubset
int	hasInternalSubset		(void * ctx)

+
Does this document has an internal subset DEPRECATED: use xmlSAX2HasInternalSubset()

+
ctx:the user data (XML parser context)
Returns:1 if true
Function: reference
void	reference			(void * ctx, 
					 const xmlChar * name)

+
called when an entity reference is detected. DEPRECATED: use xmlSAX2Reference()

+
ctx:the user data (XML parser context)
name:The entity name
Function: notationDecl
void	notationDecl			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId)

+
What to do when a notation declaration has been parsed. DEPRECATED: use xmlSAX2NotationDecl()

+
ctx:the user data (XML parser context)
name:The name of the notation
publicId:The public ID of the entity
systemId:The system ID of the entity
Function: getSystemId
const xmlChar *	getSystemId		(void * ctx)

+
Provides the system ID, basically URL or filename e.g. http://www.sgmlsource.com/dtds/memo.dtd DEPRECATED: use xmlSAX2GetSystemId()

+
ctx:the user data (XML parser context)
Returns:a xmlChar *
Function: externalSubset
void	externalSubset			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)

+
Callback on external subset declaration. DEPRECATED: use xmlSAX2ExternalSubset()

+
ctx:the user data (XML parser context)
name:the root element name
ExternalID:the external ID
SystemID:the SYSTEM ID (e.g. filename or URL)
Function: resolveEntity
xmlParserInputPtr	resolveEntity	(void * ctx, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId)

+
The entity loader, to control the loading of external entities, the application can either: - override this resolveEntity() callback in the SAX block - or better use the xmlSetExternalEntityLoader() function to set up it's own entity resolution routine DEPRECATED: use xmlSAX2ResolveEntity()

+
ctx:the user data (XML parser context)
publicId:The public ID of the entity
systemId:The system ID of the entity
Returns:the xmlParserInputPtr if inlined or NULL for DOM behaviour.
Function: startDocument
void	startDocument			(void * ctx)

+
called when the document start being processed. DEPRECATED: use xmlSAX2StartDocument()

+
ctx:the user data (XML parser context)
Function: setNamespace
void	setNamespace			(void * ctx, 
					 const xmlChar * name)

+
Set the current element namespace. DEPRECATED

+
ctx:the user data (XML parser context)
name:the namespace prefix
Function: cdataBlock
void	cdataBlock			(void * ctx, 
					 const xmlChar * value, 
					 int len)

+
called when a pcdata block has been parsed DEPRECATED: use xmlSAX2CDataBlock()

+
ctx:the user data (XML parser context)
value:The pcdata content
len:the block length
Function: getPublicId
const xmlChar *	getPublicId		(void * ctx)

 
Provides the public ID e.g. "-//SGMLSOURCE//DTD DEMO//EN" DEPRECATED: use xmlSAX2GetPublicId()

-
ctx:the user data (XML parser context)
Returns:a xmlChar *
Function: getEntity
xmlEntityPtr	getEntity		(void * ctx, 
					 const xmlChar * name)

+
ctx:the user data (XML parser context)
Returns:a xmlChar *
Function: inithtmlDefaultSAXHandler
void	inithtmlDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr)

+
Initialize the default HTML SAX version 1 handler DEPRECATED: use xmlSAX2InitHtmlDefaultSAXHandler() for the new SAX2 blocks

+
hdlr:the SAX handler
Function: processingInstruction
void	processingInstruction		(void * ctx, 
					 const xmlChar * target, 
					 const xmlChar * data)

+
A processing instruction has been parsed. DEPRECATED: use xmlSAX2ProcessingInstruction()

+
ctx:the user data (XML parser context)
target:the target name
data:the PI data's
Function: endElement
void	endElement			(void * ctx, 
					 const xmlChar * name)

+
called when the end of an element has been detected. DEPRECATED: use xmlSAX2EndElement()

+
ctx:the user data (XML parser context)
name:The element name
Function: namespaceDecl
void	namespaceDecl			(void * ctx, 
					 const xmlChar * href, 
					 const xmlChar * prefix)

+
A namespace has been parsed. DEPRECATED

+
ctx:the user data (XML parser context)
href:the namespace associated URN
prefix:the namespace prefix
Function: initdocbDefaultSAXHandler
void	initdocbDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr)

+
Initialize the default DocBook SAX version 1 handler DEPRECATED: use xmlSAX2InitDocbDefaultSAXHandler() for the new SAX2 blocks

+
hdlr:the SAX handler
Function: getEntity
xmlEntityPtr	getEntity		(void * ctx, 
					 const xmlChar * name)

 
Get an entity by name DEPRECATED: use xmlSAX2GetEntity()

 
ctx:the user data (XML parser context)
name:The entity name
Returns:the xmlEntityPtr if found.
Function: characters
void	characters			(void * ctx, 
					 const xmlChar * ch, 
					 int len)

 
receiving some chars from the parser. DEPRECATED: use xmlSAX2Characters()

 
ctx:the user data (XML parser context)
ch:a xmlChar string
len:the number of xmlChar
Function: elementDecl
void	elementDecl			(void * ctx, 
					 const xmlChar * name, 
					 int type, 
					 xmlElementContentPtr content)

 
An element definition has been parsed DEPRECATED: use xmlSAX2ElementDecl()

-
ctx:the user data (XML parser context)
name:the element name
type:the element type
content:the element value tree
Function: ignorableWhitespace
void	ignorableWhitespace		(void * ctx, 
					 const xmlChar * ch, 
					 int len)

-
receiving some ignorable whitespaces from the parser. UNUSED: by default the DOM building will use characters DEPRECATED: use xmlSAX2IgnorableWhitespace()

-
ctx:the user data (XML parser context)
ch:a xmlChar string
len:the number of xmlChar
Function: hasExternalSubset
int	hasExternalSubset		(void * ctx)

-
Does this document has an external subset DEPRECATED: use xmlSAX2HasExternalSubset()

-
ctx:the user data (XML parser context)
Returns:1 if true
Function: isStandalone
int	isStandalone			(void * ctx)

-
Is this document tagged standalone ? DEPRECATED: use xmlSAX2IsStandalone()

-
ctx:the user data (XML parser context)
Returns:1 if true
Function: unparsedEntityDecl
void	unparsedEntityDecl		(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId, 
					 const xmlChar * notationName)

-
What to do when an unparsed entity declaration is parsed DEPRECATED: use xmlSAX2UnparsedEntityDecl()

-
ctx:the user data (XML parser context)
name:The name of the entity
publicId:The public ID of the entity
systemId:The system ID of the entity
notationName:the name of the notation
Function: reference
void	reference			(void * ctx, 
					 const xmlChar * name)

-
called when an entity reference is detected. DEPRECATED: use xmlSAX2Reference()

-
ctx:the user data (XML parser context)
name:The entity name
Function: globalNamespace
void	globalNamespace			(void * ctx, 
					 const xmlChar * href, 
					 const xmlChar * prefix)

-
An old global namespace has been parsed. DEPRECATED

-
ctx:the user data (XML parser context)
href:the namespace associated URN
prefix:the namespace prefix
Function: initxmlDefaultSAXHandler
void	initxmlDefaultSAXHandler	(xmlSAXHandlerV1 * hdlr, 
					 int warning)

-
Initialize the default XML SAX version 1 handler DEPRECATED: use xmlSAX2InitDefaultSAXHandler() for the new SAX2 blocks

-
hdlr:the SAX handler
warning:flag if non-zero sets the handler warning procedure
Function: hasInternalSubset
int	hasInternalSubset		(void * ctx)

-
Does this document has an internal subset DEPRECATED: use xmlSAX2HasInternalSubset()

-
ctx:the user data (XML parser context)
Returns:1 if true
Function: processingInstruction
void	processingInstruction		(void * ctx, 
					 const xmlChar * target, 
					 const xmlChar * data)

-
A processing instruction has been parsed. DEPRECATED: use xmlSAX2ProcessingInstruction()

-
ctx:the user data (XML parser context)
target:the target name
data:the PI data's
Function: getParameterEntity
xmlEntityPtr	getParameterEntity	(void * ctx, 
					 const xmlChar * name)

+
ctx:the user data (XML parser context)
name:the element name
type:the element type
content:the element value tree
Function: startElement
void	startElement			(void * ctx, 
					 const xmlChar * fullname, 
					 const xmlChar ** atts)

+
called when an opening tag has been processed. DEPRECATED: use xmlSAX2StartElement()

+
ctx:the user data (XML parser context)
fullname:The element name, including namespace prefix
atts:An array of name/value attributes pairs, NULL terminated
Function: getParameterEntity
xmlEntityPtr	getParameterEntity	(void * ctx, 
					 const xmlChar * name)

 
Get a parameter entity by name DEPRECATED: use xmlSAX2GetParameterEntity()

 
ctx:the user data (XML parser context)
name:The entity name
Returns:the xmlEntityPtr if found.
Function: attributeDecl
void	attributeDecl			(void * ctx, 
					 const xmlChar * elem, 
					 const xmlChar * fullname, 
					 int type, 
					 int def, 
					 const xmlChar * defaultValue, 
					 xmlEnumerationPtr tree)

 
An attribute definition has been parsed DEPRECATED: use xmlSAX2AttributeDecl()

-
ctx:the user data (XML parser context)
elem:the name of the element
fullname:the attribute name
type:the attribute type
def:the type of default value
defaultValue:the attribute default value
tree:the tree of enumerated value set
Function: notationDecl
void	notationDecl			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId)

-
What to do when a notation declaration has been parsed. DEPRECATED: use xmlSAX2NotationDecl()

-
ctx:the user data (XML parser context)
name:The name of the notation
publicId:The public ID of the entity
systemId:The system ID of the entity
Function: entityDecl
void	entityDecl			(void * ctx, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId, 
					 xmlChar * content)

-
An entity definition has been parsed DEPRECATED: use xmlSAX2EntityDecl()

-
ctx:the user data (XML parser context)
name:the entity name
type:the entity type
publicId:The public ID of the entity
systemId:The system ID of the entity
content:the entity value (without processing).
Function: setNamespace
void	setNamespace			(void * ctx, 
					 const xmlChar * name)

-
Set the current element namespace. DEPRECATED

-
ctx:the user data (XML parser context)
name:the namespace prefix
Function: externalSubset
void	externalSubset			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)

-
Callback on external subset declaration. DEPRECATED: use xmlSAX2ExternalSubset()

-
ctx:the user data (XML parser context)
name:the root element name
ExternalID:the external ID
SystemID:the SYSTEM ID (e.g. filename or URL)
Function: resolveEntity
xmlParserInputPtr	resolveEntity	(void * ctx, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId)

-
The entity loader, to control the loading of external entities, the application can either: - override this resolveEntity() callback in the SAX block - or better use the xmlSetExternalEntityLoader() function to set up it's own entity resolution routine DEPRECATED: use xmlSAX2ResolveEntity()

-
ctx:the user data (XML parser context)
publicId:The public ID of the entity
systemId:The system ID of the entity
Returns:the xmlParserInputPtr if inlined or NULL for DOM behaviour.
Function: getSystemId
const xmlChar *	getSystemId		(void * ctx)

-
Provides the system ID, basically URL or filename e.g. http://www.sgmlsource.com/dtds/memo.dtd DEPRECATED: use xmlSAX2GetSystemId()

-
ctx:the user data (XML parser context)
Returns:a xmlChar *
Function: startDocument
void	startDocument			(void * ctx)

-
called when the document start being processed. DEPRECATED: use xmlSAX2StartDocument()

-
ctx:the user data (XML parser context)
Function: internalSubset
void	internalSubset			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)

+
ctx:the user data (XML parser context)
elem:the name of the element
fullname:the attribute name
type:the attribute type
def:the type of default value
defaultValue:the attribute default value
tree:the tree of enumerated value set
Function: isStandalone
int	isStandalone			(void * ctx)

+
Is this document tagged standalone ? DEPRECATED: use xmlSAX2IsStandalone()

+
ctx:the user data (XML parser context)
Returns:1 if true
Function: internalSubset
void	internalSubset			(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)

 
Callback on internal subset declaration. DEPRECATED: use xmlSAX2InternalSubset()

 
ctx:the user data (XML parser context)
name:the root element name
ExternalID:the external ID
SystemID:the SYSTEM ID (e.g. filename or URL)
Function: endDocument
void	endDocument			(void * ctx)

 
called when the document end has been detected. DEPRECATED: use xmlSAX2EndDocument()

diff --git a/doc/html/libxml-hash.html b/doc/html/libxml-hash.html
index 28faf213..278bdd41 100644
--- a/doc/html/libxml-hash.html
+++ b/doc/html/libxml-hash.html
@@ -10,7 +10,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 Module hash from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo
Module hash from libxml2
API Menu
API Indexes
Related links
PrevglobalsUpAPI documentationHomeThe XML C parser and toolkit of GnomelistNext
Table of Contents
#define XML_CAST_FPTR
Structure xmlHashTable
struct _xmlHashTable
+    Module hash from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo
Module hash from libxml2
API Menu
API Indexes
Related links
PrevglobalsUpAPI documentationHomeThe XML C parser and toolkit of GnomelistNext
This module implements the hash table support used in various places in the library. 
Table of Contents
#define XML_CAST_FPTR
Structure xmlHashTable
struct _xmlHashTable
 The content of this structure is not made public by the API.
 
Typedef xmlHashTable * xmlHashTablePtr
 
int	xmlHashAddEntry			(xmlHashTablePtr table, 
					 const xmlChar * name, 
					 void * userdata)

diff --git a/doc/html/libxml-lib.html b/doc/html/libxml-lib.html
index a6b96d08..375dbfea 100644
--- a/doc/html/libxml-lib.html
+++ b/doc/html/libxml-lib.html
@@ -10,4 +10,4 @@ A:link, A:visited, A:active { text-decoration: underline }
 Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo
Reference Manual for libxml2
API Menu
API Indexes
Related links
Table of Contents
  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionnary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers
Daniel Veillard

+    Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo
Reference Manual for libxml2
API Menu
API Indexes
Related links
Table of Contents
  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionnary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: Chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers
Daniel Veillard

diff --git a/doc/html/libxml-parserInternals.html b/doc/html/libxml-parserInternals.html
index 881e477d..e0870b68 100644
--- a/doc/html/libxml-parserInternals.html
+++ b/doc/html/libxml-parserInternals.html
@@ -105,8 +105,8 @@ void	xmlEntityReferenceFunc		(int	xmlSwitchToEncoding		(xmlParserCtxtPtr ctxt, 
					 xmlCharEncodingHandlerPtr handler)
 
Description

 
Macro: INPUT_CHUNK
#define INPUT_CHUNK
The parser tries to always have that amount of input ready. One of the point is providing context when reporting errors.

-
Macro: IS_ASCII_DIGIT
#define IS_ASCII_DIGIT

-
Macro: IS_ASCII_LETTER
#define IS_ASCII_LETTER

+
Macro: IS_ASCII_DIGIT
#define IS_ASCII_DIGIT
Macro to check [0-9]

+
Macro: IS_ASCII_LETTER
#define IS_ASCII_LETTER
Macro to check [a-zA-Z]

 
Macro: IS_BASECHAR
#define IS_BASECHAR
Macro to check the following production in the XML spec: [85] BaseChar ::= ... long list see REC ...

 
Macro: IS_BLANK
#define IS_BLANK
Macro to check the following production in the XML spec: [3] S ::= (#x20 | #x9 | #xD | #xA)+

 
Macro: IS_BLANK_CH
#define IS_BLANK_CH
Behaviour same as IS_BLANK

diff --git a/doc/html/libxml-schemasInternals.html b/doc/html/libxml-schemasInternals.html
index fc971407..c16e32fd 100644
--- a/doc/html/libxml-schemasInternals.html
+++ b/doc/html/libxml-schemasInternals.html
@@ -53,7 +53,7 @@ The content of this structure is not made public by the API.
 
Macro: XML_SCHEMAS_ATTRGROUP_MARKED
#define XML_SCHEMAS_ATTRGROUP_MARKED
Marks the attr group as marked; used for circular checks.

 
Macro: XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
#define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
The attribute wildcard has been already builded.

 
Macro: XML_SCHEMAS_ATTR_FIXED
#define XML_SCHEMAS_ATTR_FIXED
the attribute has a fixed value

-
Macro: XML_SCHEMAS_ATTR_GLOBAL
#define XML_SCHEMAS_ATTR_GLOBAL

+
Macro: XML_SCHEMAS_ATTR_GLOBAL
#define XML_SCHEMAS_ATTR_GLOBAL
allow elements in no namespace

 
Macro: XML_SCHEMAS_ATTR_INTERNAL_RESOLVED
#define XML_SCHEMAS_ATTR_INTERNAL_RESOLVED
this is set when the "type" and "ref" references have been resolved.

 
Macro: XML_SCHEMAS_ATTR_NSDEFAULT
#define XML_SCHEMAS_ATTR_NSDEFAULT
allow elements in no namespace

 
Macro: XML_SCHEMAS_ATTR_USE_OPTIONAL
#define XML_SCHEMAS_ATTR_USE_OPTIONAL
The attribute is optional.

@@ -67,14 +67,14 @@ The content of this structure is not made public by the API.
 
Macro: XML_SCHEMAS_ELEM_BLOCK_EXTENSION
#define XML_SCHEMAS_ELEM_BLOCK_EXTENSION
disallowed substitutions are absent

 
Macro: XML_SCHEMAS_ELEM_BLOCK_RESTRICTION
#define XML_SCHEMAS_ELEM_BLOCK_RESTRICTION
disallowed substitutions: "restriction"

 
Macro: XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION
#define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION
disallowed substitutions: "substituion"

-
Macro: XML_SCHEMAS_ELEM_CIRCULAR
#define XML_SCHEMAS_ELEM_CIRCULAR

+
Macro: XML_SCHEMAS_ELEM_CIRCULAR
#define XML_SCHEMAS_ELEM_CIRCULAR
a helper flag for the search of circular references.

 
Macro: XML_SCHEMAS_ELEM_DEFAULT
#define XML_SCHEMAS_ELEM_DEFAULT
the element has a default value

 
Macro: XML_SCHEMAS_ELEM_FINAL_ABSENT
#define XML_SCHEMAS_ELEM_FINAL_ABSENT
substitution group exclusions are absent

-
Macro: XML_SCHEMAS_ELEM_FINAL_EXTENSION
#define XML_SCHEMAS_ELEM_FINAL_EXTENSION

-
Macro: XML_SCHEMAS_ELEM_FINAL_RESTRICTION
#define XML_SCHEMAS_ELEM_FINAL_RESTRICTION

+
Macro: XML_SCHEMAS_ELEM_FINAL_EXTENSION
#define XML_SCHEMAS_ELEM_FINAL_EXTENSION
substitution group exclusions: "extension"

+
Macro: XML_SCHEMAS_ELEM_FINAL_RESTRICTION
#define XML_SCHEMAS_ELEM_FINAL_RESTRICTION
substitution group exclusions: "restriction"

 
Macro: XML_SCHEMAS_ELEM_FIXED
#define XML_SCHEMAS_ELEM_FIXED
the element has a fixed value

 
Macro: XML_SCHEMAS_ELEM_GLOBAL
#define XML_SCHEMAS_ELEM_GLOBAL
the element is global

-
Macro: XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
#define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED

+
Macro: XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
#define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
this is set when "type", "ref", "substitutionGroup" references have been resolved.

 
Macro: XML_SCHEMAS_ELEM_NILLABLE
#define XML_SCHEMAS_ELEM_NILLABLE
the element is nillable

 
Macro: XML_SCHEMAS_ELEM_NSDEFAULT
#define XML_SCHEMAS_ELEM_NSDEFAULT
allow elements in no namespace Obsolete, not used anymore.

 
Macro: XML_SCHEMAS_ELEM_REF
#define XML_SCHEMAS_ELEM_REF
the element is a reference to a type

@@ -93,17 +93,17 @@ The content of this structure is not made public by the API.
 
Macro: XML_SCHEMAS_TYPE_ABSTRACT
#define XML_SCHEMAS_TYPE_ABSTRACT
the simple/complexType is abstract.

 
Macro: XML_SCHEMAS_TYPE_BLOCK_DEFAULT
#define XML_SCHEMAS_TYPE_BLOCK_DEFAULT
the complexType did not specify 'block' so use the default of the <schema> item.

 
Macro: XML_SCHEMAS_TYPE_BLOCK_EXTENSION
#define XML_SCHEMAS_TYPE_BLOCK_EXTENSION
the complexType has a 'block' of "extension".

-
Macro: XML_SCHEMAS_TYPE_BLOCK_RESTRICTION
#define XML_SCHEMAS_TYPE_BLOCK_RESTRICTION

-
Macro: XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE
#define XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE

+
Macro: XML_SCHEMAS_TYPE_BLOCK_RESTRICTION
#define XML_SCHEMAS_TYPE_BLOCK_RESTRICTION
the complexType has a 'block' of "restriction".

+
Macro: XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE
#define XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE
Marks the item as a builtin primitive.

 
Macro: XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION
#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION
the simple or complex type has a derivation method of "extension".

 
Macro: XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION
#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION
the simple or complex type has a derivation method of "restriction".

-
Macro: XML_SCHEMAS_TYPE_FINAL_DEFAULT
#define XML_SCHEMAS_TYPE_FINAL_DEFAULT

+
Macro: XML_SCHEMAS_TYPE_FINAL_DEFAULT
#define XML_SCHEMAS_TYPE_FINAL_DEFAULT
the simpleType has a final of "default".

 
Macro: XML_SCHEMAS_TYPE_FINAL_EXTENSION
#define XML_SCHEMAS_TYPE_FINAL_EXTENSION
the complexType has a final of "extension".

 
Macro: XML_SCHEMAS_TYPE_FINAL_LIST
#define XML_SCHEMAS_TYPE_FINAL_LIST
the simpleType has a final of "list".

 
Macro: XML_SCHEMAS_TYPE_FINAL_RESTRICTION
#define XML_SCHEMAS_TYPE_FINAL_RESTRICTION
the simpleType/complexType has a final of "restriction".

 
Macro: XML_SCHEMAS_TYPE_FINAL_UNION
#define XML_SCHEMAS_TYPE_FINAL_UNION
the simpleType has a final of "union".

 
Macro: XML_SCHEMAS_TYPE_GLOBAL
#define XML_SCHEMAS_TYPE_GLOBAL
the type is global

-
Macro: XML_SCHEMAS_TYPE_MARKED
#define XML_SCHEMAS_TYPE_MARKED

+
Macro: XML_SCHEMAS_TYPE_MARKED
#define XML_SCHEMAS_TYPE_MARKED
Marks the item as marked; used for circular checks.

 
Macro: XML_SCHEMAS_TYPE_MIXED
#define XML_SCHEMAS_TYPE_MIXED
the element content type is mixed

 
Macro: XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
#define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
the complexType owns an attribute wildcard, i.e. it can be freed by the complexType

 
Macro: XML_SCHEMAS_TYPE_VARIETY_ABSENT
#define XML_SCHEMAS_TYPE_VARIETY_ABSENT
the simpleType has a variety of "absent".

diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 52908a29..a03e04f7 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -74,14 +74,14 @@ void *	xmlMallocFunc			(size_t size)
 
Returns:an int representing the number of blocks
Function: xmlMemDisplay
void	xmlMemDisplay			(FILE * fp)

 
show in-extenso the memory blocks allocated

 
fp:a FILE descriptor used as the output file, if NULL, the result is written to the file .memorylist
Function: xmlMemFree
void	xmlMemFree			(void * ptr)

-
a free() equivalent, with error checking.

-
ptr:the memory block pointer
Function: xmlMemGet
int	xmlMemGet			(xmlFreeFunc * freeFunc, 
					 xmlMallocFunc * mallocFunc, 
					 xmlReallocFunc * reallocFunc, 
					 xmlStrdupFunc * strdupFunc)

+

+
ptr:
Function: xmlMemGet
int	xmlMemGet			(xmlFreeFunc * freeFunc, 
					 xmlMallocFunc * mallocFunc, 
					 xmlReallocFunc * reallocFunc, 
					 xmlStrdupFunc * strdupFunc)

 
Provides the memory access functions set currently in use

 
freeFunc:place to save the free() function in use
mallocFunc:place to save the malloc() function in use
reallocFunc:place to save the realloc() function in use
strdupFunc:place to save the strdup() function in use
Returns:0 on success
Function: xmlMemMalloc
void *	xmlMemMalloc			(size_t size)

-
a malloc() equivalent, with logging of the allocation info.

-
size:an int specifying the size in byte to allocate.
Returns:a pointer to the allocated area or NULL in case of lack of memory.
Function: xmlMemRealloc
void *	xmlMemRealloc			(void * ptr, 
					 size_t size)

-
a realloc() equivalent, with logging of the allocation info.

-
ptr:the initial memory block pointer
size:an int specifying the size in byte to allocate.
Returns:a pointer to the allocated area or NULL in case of lack of memory.
Function: xmlMemSetup
int	xmlMemSetup			(xmlFreeFunc freeFunc, 
					 xmlMallocFunc mallocFunc, 
					 xmlReallocFunc reallocFunc, 
					 xmlStrdupFunc strdupFunc)

+

+
size:
Returns:
Function: xmlMemRealloc
void *	xmlMemRealloc			(void * ptr, 
					 size_t size)

+

+
ptr:
size:
Returns:
Function: xmlMemSetup
int	xmlMemSetup			(xmlFreeFunc freeFunc, 
					 xmlMallocFunc mallocFunc, 
					 xmlReallocFunc reallocFunc, 
					 xmlStrdupFunc strdupFunc)

 
Override the default memory access functions with a new set This has to be called before any other libxml routines ! Should this be blocked if there was already some allocations done ?

 
freeFunc:the free() function to use
mallocFunc:the malloc() function to use
reallocFunc:the realloc() function to use
strdupFunc:the strdup() function to use
Returns:0 on success
Function: xmlMemShow
void	xmlMemShow			(FILE * fp, 
					 int nr)

 
show a show display of the memory allocated, and dump the @nr last allocated areas which were not freed

@@ -92,8 +92,8 @@ void *	xmlMallocFunc			(size_t size)
 
Returns:an int representing the amount of memory allocated.
Function: xmlMemoryDump
void	xmlMemoryDump			(void)

 
Dump in-extenso the memory blocks allocated to the file .memorylist

 
Function: xmlMemoryStrdup
char *	xmlMemoryStrdup			(const char * str)

-
a strdup() equivalent, with logging of the allocation info.

-
str:the initial string pointer
Returns:a pointer to the new string or NULL if allocation error occurred.
Function type: xmlReallocFunc
Function type: xmlReallocFunc
+

+
str:
Returns:
Function type: xmlReallocFunc
Function type: xmlReallocFunc
 void *	xmlReallocFunc			(void * mem, 
					 size_t size)
 
Signature for a realloc() implementation.
mem:an already allocated block of memory
size:the new size requested in bytes
Returns:a pointer to the newly reallocated block or NULL in case of error.


 
Function: xmlReallocLoc
void *	xmlReallocLoc			(void * ptr, 
					 size_t size, 
					 const char * file, 
					 int line)

diff --git a/doc/html/libxml-xmlschemas.html b/doc/html/libxml-xmlschemas.html
index 8ce82fb3..ce3e9e4b 100644
--- a/doc/html/libxml-xmlschemas.html
+++ b/doc/html/libxml-xmlschemas.html
@@ -129,8 +129,8 @@ The content of this structure is not made public by the API.
 
ctxt:a schema validation context
err:the error function
warn:the warning function
ctx:the functions context
Function: xmlSchemaSetValidOptions
int	xmlSchemaSetValidOptions	(xmlSchemaValidCtxtPtr ctxt, 
					 int options)

 
Sets the options to be used during the validation.

 
ctxt:a schema validation context
options:a combination of xmlSchemaValidOption
Returns:0 in case of success, -1 in case of an API error.
Function: xmlSchemaValidCtxtGetOptions
int	xmlSchemaValidCtxtGetOptions	(xmlSchemaValidCtxtPtr ctxt)

-

-
ctxt:a schema validation context
Returns:the option combination of the validation context.
Function: xmlSchemaValidateDoc
int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr doc)

+
Get the validation context options.

+
ctxt:a schema validation context
Returns:the option combination or -1 on error.
Function: xmlSchemaValidateDoc
int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr doc)

 
Validate a document tree in memory.

 
ctxt:a schema validation context
doc:a parsed document tree
Returns:0 if the document is schemas valid, a positive error code number otherwise and -1 in case of internal or API error.
Function: xmlSchemaValidateOneElement
int	xmlSchemaValidateOneElement	(xmlSchemaValidCtxtPtr ctxt, 
					 xmlNodePtr elem)

 
Validate a branch of a tree, starting with the given @elem.

diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 2991acd4..cec31c7d 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -6,23 +6,23 @@
      interface for a DocBook SGML non-verifying parser This code is DEPRECATED, and should not be used anymore. 
      Daniel Veillard 
      
-     
      
      
      
+     
      
      
      
+     
+     
+     
+     
+     
      
      
      
      
-     
-     
-     
-     
      
-     
     
     
      interface for an HTML 4.0 non-verifying parser
@@ -32,15 +32,15 @@
      
      
      
-     
      
      
-     
      
      
-     
      
      
+     
+     
+     
      
      
      
@@ -58,43 +58,43 @@
      
      
      
-     
-     
-     
      
      
      
-     
-     
-     
-     
      
+     
      
-     
-     
-     
-     
      
-     
+     
      
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
-     
-     
      
      
-     
-     
      
-     
-     
+     
      
-     
      
-     
     
     
      specific APIs to process HTML tree, especially serialization
@@ -105,21 +105,21 @@
      
      
      
+     
      
      
      
      
-     
-     
+     
+     
      
      
      
-     
-     
+     
      
      
      
-     
+     
      
      
     
@@ -128,40 +128,40 @@
      DEPRECATED set of SAX version 1 interfaces used to build the DOM tree. 
      Daniel Veillard 
      
-     
      
      
-     
-     
      
-     
+     
      
-     
      
-     
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
+     
+     
+     
+     
+     
      
      
      
-     
-     
-     
-     
-     
-     
-     
-     
-     
+     
      
      
-     
-     
-     
-     
-     
-     
-     
+     
      
      
      
@@ -170,43 +170,43 @@
      SAX2 parser interface used to build the DOM tree
      those are the default SAX2 interfaces used by the library when building DOM tree. 
      Daniel Veillard 
-     
      
-     
-     
      
-     
-     
      
      
      
-     
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
      
-     
-     
      
-     
-     
      
-     
      
-     
      
      
-     
-     
-     
      
-     
      
-     
      
      
-     
      
     
     
@@ -225,53 +225,53 @@
      Daniel Veillard 
      
      
-     
      
      
-     
-     
      
      
+     
+     
+     
      
      
      
      
-     
      
      
      
      
      
      
-     
-     
-     
-     
+     
      
-     
      
-     
      
-     
      
      
-     
-     
+     
      
-     
-     
-     
      
      
-     
-     
      
-     
      
      
-     
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
     
     
      Unicode character range checking
@@ -279,43 +279,43 @@
      William Brack <wbrack@mmm.com.hk> 
      
      
+     
      
      
-     
+     
      
      
      
-     
+     
      
      
      
      
-     
-     
-     
      
      
-     
      
+     
+     
+     
      
      
      
+     
+     
      
      
-     
      
      
      
-     
-     
      
      
-     
-     
-     
-     
-     
      
+     
+     
+     
+     
+     
+     
     
     
      Tree debugging APIs
@@ -324,36 +324,36 @@
      
      
      
-     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
      
-     
+     
      
-     
-     
-     
      
-     
-     
-     
-     
-     
      
+     
      
      
-     
-     
-     
-     
-     
-     
-     
-     
-     
      
-     
+     
+     
+     
+     
+     
     
     
      string dictionnary
@@ -361,15 +361,15 @@
      Daniel Veillard 
      
      
-     
      
-     
-     
-     
      
+     
+     
+     
+     
+     
      
      
-     
     
     
      interface for the encoding conversion functions
@@ -380,10 +380,14 @@
      
      
      
+     
      
+     
+     
+     
      
      
-     
+     
      
      
      
@@ -393,11 +397,7 @@
      
      
      
-     
-     
-     
      
-     
      
      
      
@@ -430,18 +430,18 @@
      this module provides some of the entity API needed for the parser and applications. 
      Daniel Veillard 
      
-     
-     
      
      
      
+     
+     
      
      
      
      
      
      
-     
+     
      
      
      
@@ -450,11 +450,11 @@
      
      
      
-     
+     
      
-     
-     
+     
      
+     
     
     
      interface for all global variables of the library
@@ -463,101 +463,102 @@
      
      
      
-     
-     
-     
-     
      
-     
-     
      
-     
-     
      
-     
-     
+     
      
-     
-     
-     
      
      
-     
-     
-     
-     
      
      
      
-     
      
+     
      
-     
+     
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
-     
-     
-     
-     
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
      
-     
-     
      
-     
+     
      
      
      
      
-     
      
-     
      
-     
      
-     
-     
-     
      
-     
     
     
-     chained hash tables
+     Chained hash tables
+     This module implements the hash table support used in various places in the library. 
      Bjorn Reese <bjorn.reese@systematic.dk> 
      
      
      
      
-     
-     
-     
-     
-     
      
-     
-     
+     
+     
      
-     
-     
      
      
-     
      
      
-     
-     
+     
      
      
      
      
      
-     
+     
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
     
     
@@ -568,64 +569,64 @@
      
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
      
-     
-     
-     
-     
      
-     
-     
-     
      
-     
-     
      
-     
-     
      
      
      
      
-     
      
-     
-     
-     
      
-     
+     
+     
+     
     
     
      minimal FTP implementation
      minimal FTP implementation allowing to fetch resources like external subset. 
      Daniel Veillard 
-     
      
      
-     
-     
      
-     
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
-     
      
      
-     
-     
      
-     
-     
+     
      
      
      
-     
     
     
      minimal HTTP implementation
@@ -636,12 +637,12 @@
      
      
      
-     
+     
      
      
      
      
-     
+     
      
      
      
@@ -658,78 +659,117 @@
      
      
      
-     
      
      
      
-     
-     
-     
+     
      
      
-     
-     
-     
-     
-     
      
      
      
      
      
-     
-     
      
      
-     
-     
      
      
-     
-     
-     
+     
      
-     
-     
      
-     
-     
      
      
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
-     
-     
      
-     
      
      
-     
      
+     
+     
+     
+     
      
-     
-     
      
      
      
+     
+     
      
-     
-     
      
+     
      
-     
      
      
-     
-     
-     
      
      
      
      
-     
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
@@ -737,83 +777,44 @@
      
      
      
-     
      
-     
-     
-     
+     
      
      
-     
-     
      
-     
      
      
-     
      
      
      
-     
-     
-     
-     
-     
-     
-     
-     
      
-     
-     
-     
-     
-     
-     
+     
+     
+     
+     
+     
      
-     
      
      
-     
      
-     
      
      
-     
-     
      
      
-     
-     
      
      
-     
-     
-     
-     
      
      
-     
      
-     
      
-     
      
-     
-     
+     
      
      
-     
      
-     
      
-     
-     
-     
-     
-     
-     
+     
      
-     
      
     
     
@@ -822,126 +823,126 @@
      Daniel Veillard 
      
      
-     
      
-     
      
-     
-     
      
-     
      
-     
      
-     
-     
-     
-     
      
-     
-     
+     
      
-     
-     
-     
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
      
      
      
-     
-     
-     
      
-     
-     
-     
-     
-     
      
      
-     
      
      
      
      
-     
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
      
-     
-     
      
-     
-     
-     
-     
-     
      
-     
-     
-     
      
-     
      
      
-     
-     
-     
+     
      
      
      
      
-     
-     
-     
+     
      
-     
-     
      
      
      
-     
-     
      
-     
      
      
-     
      
-     
+     
      
-     
-     
      
      
-     
-     
      
-     
-     
-     
-     
-     
-     
-     
+     
+     
      
-     
-     
-     
-     
-     
-     
      
-     
+     
      
-     
      
     
     
@@ -968,17 +969,17 @@
      
      
      
-     
+     
      
      
-     
+     
      
      
      
      
      
      
-     
+     
      
      
      
@@ -996,40 +997,40 @@
      
      
      
-     
+     
      
      
      
      
      
      
+     
+     
      
      
      
-     
      
      
-     
      
-     
      
      
-     
-     
      
-     
      
-     
      
      
-     
      
      
-     
      
      
-     
      
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
@@ -1057,25 +1058,24 @@
      
      
      
-     
+     
      
      
      
+     
      
-     
      
      
      
      
      
-     
      
      
-     
+     
      
      
      
-     
+     
      
      
      
@@ -1084,6 +1084,7 @@
      
      
      
+     
      
      
      
@@ -1098,7 +1099,7 @@
      
      
      
-     
+     
      
      
      
@@ -1107,133 +1108,133 @@
      
      
      
-     
-     
-     
-     
-     
-     
      
-     
-     
-     
      
      
      
      
      
      
-     
-     
+     
+     
      
-     
      
-     
+     
      
-     
-     
-     
      
-     
-     
      
      
-     
-     
      
-     
      
      
-     
-     
      
-     
-     
-     
      
      
-     
-     
-     
-     
-     
      
-     
      
      
-     
-     
-     
      
-     
      
      
      
      
      
-     
-     
+     
      
      
-     
-     
-     
-     
-     
+     
      
      
      
-     
      
-     
      
-     
-     
      
-     
-     
      
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
      
-     
-     
-     
-     
-     
      
-     
      
-     
      
      
-     
      
      
      
-     
-     
      
      
      
      
-     
-     
-     
-     
      
+     
      
-     
      
      
-     
+     
      
      
      
-     
+     
      
      
      
@@ -1250,9 +1251,9 @@
      
      
      
-     
-     
      
+     
+     
      
      
      
@@ -1262,33 +1263,33 @@
      
      
      
-     
+     
     
     
      interfaces for tree manipulation
      this module describes the structures found in an tree resulting from an XML or HTML parsing, as well as the API provided for various processing on that tree 
      Daniel Veillard 
      
-     
      
      
-     
      
-     
      
+     
+     
+     
      
-     
+     
      
-     
+     
      
      
-     
+     
      
      
      
      
      
-     
+     
      
      
      
@@ -1297,7 +1298,7 @@
      
      
      
-     
+     
      
      
      
@@ -1310,16 +1311,16 @@
      
      
      
-     
+     
      
      
-     
+     
      
      
      
      
      
-     
+     
      
      
      
@@ -1331,46 +1332,46 @@
      
      
      
+     
      
      
      
-     
+     
      
-     
+     
      
      
-     
      
      
-     
-     
+     
+     
      
      
      
      
-     
+     
      
      
      
-     
+     
+     
      
      
-     
      
-     
+     
      
      
      
      
-     
+     
      
      
      
      
      
      
-     
-     
+     
+     
      
      
      
@@ -1380,158 +1381,158 @@
      
      
      
-     
-     
      
+     
+     
      
      
      
      
      
-     
      
-     
+     
      
      
-     
-     
-     
-     
-     
-     
+     
      
-     
      
-     
      
-     
-     
-     
-     
-     
-     
+     
+     
      
      
-     
+     
      
-     
-     
      
-     
-     
-     
-     
-     
+     
+     
      
-     
      
-     
      
-     
-     
-     
-     
-     
-     
-     
-     
-     
+     
+     
      
-     
-     
      
-     
      
-     
-     
      
      
      
-     
      
-     
      
-     
+     
      
-     
      
      
-     
      
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
-     
-     
-     
      
-     
      
-     
      
-     
      
-     
      
-     
+     
      
      
      
      
-     
      
-     
      
-     
-     
      
-     
-     
-     
      
      
-     
+     
      
-     
-     
-     
      
-     
      
-     
      
      
      
      
-     
-     
-     
      
      
-     
      
      
      
-     
-     
-     
      
-     
      
-     
      
-     
      
-     
-     
-     
-     
-     
+     
+     
      
      
-     
-     
      
      
     
@@ -1566,20 +1567,20 @@
      
      
      
-     
+     
      
      
      
      
      
-     
+     
      
      
      
      
      
      
-     
+     
      
      
      
@@ -1588,14 +1589,14 @@
      
      
      
-     
-     
+     
+     
      
      
-     
+     
      
+     
      
-     
      
      
      
@@ -1603,22 +1604,21 @@
      
      
      
-     
-     
+     
+     
      
      
      
-     
+     
      
-     
-     
+     
+     
      
      
      
-     
-     
+     
+     
      
-     
      
      
      
@@ -1635,10 +1635,11 @@
      
      
      
-     
-     
+     
+     
      
      
+     
      
      
      
@@ -1653,16 +1654,17 @@
      Daniel Veillard 
      
      
-     
-     
      
-     
      
      
      
+     
+     
+     
      
      
      
+     
      
      
      
@@ -1670,7 +1672,6 @@
      
      
      
-     
     
     
      unfinished XLink detection module
@@ -1678,32 +1679,32 @@
      Daniel Veillard 
      
      
-     
+     
      
      
      
-     
+     
      
-     
+     
      
      
+     
+     
+     
+     
      
      
-     
      
-     
      
-     
-     
      
+     
+     
+     
+     
+     
      
      
      
-     
-     
-     
-     
-     
      
     
     
@@ -1728,7 +1729,7 @@
      
      
      
-     
+     
      
      
      
@@ -1766,7 +1767,7 @@
      
      
      
-     
+     
     
     
      API to build regexp automata
@@ -1784,14 +1785,14 @@
      
      
      
-     
+     
      
      
      
      
      
      
-     
+     
      
      
     
@@ -1800,12 +1801,15 @@
      the API used to report errors 
      Daniel Veillard 
      
-     
+     
      
      
+     
      
      
      
+     
+     
      
      
      
@@ -1818,13 +1822,12 @@
      
      
      
-     
-     
      
      
      
      
      
+     
      
      
      
@@ -1843,15 +1846,14 @@
      
      
      
-     
-     
      
      
      
-     
+     
+     
      
      
-     
+     
      
      
      
@@ -1870,6 +1872,7 @@
      
      
      
+     
      
      
      
@@ -1877,7 +1880,7 @@
      
      
      
-     
+     
      
      
      
@@ -1885,25 +1888,23 @@
      
      
      
-     
+     
      
      
      
      
      
      
-     
      
      
      
      
      
-     
-     
+     
      
      
      
-     
+     
      
      
      
@@ -1915,27 +1916,26 @@
      
      
      
-     
-     
+     
      
-     
+     
      
      
      
      
-     
+     
      
-     
+     
      
      
      
-     
+     
      
      
      
-     
+     
      
-     
+     
      
      
      
@@ -1949,14 +1949,14 @@
      
      
      
-     
+     
      
      
-     
+     
      
      
      
-     
+     
      
      
      
@@ -1968,7 +1968,6 @@
      
      
      
-     
      
      
      
@@ -1984,15 +1983,14 @@
      
      
      
-     
+     
      
-     
+     
      
      
      
      
      
-     
      
      
      
@@ -2014,7 +2012,7 @@
      
      
      
-     
+     
      
      
      
@@ -2026,11 +2024,11 @@
      
      
      
-     
+     
      
      
      
-     
+     
      
      
      
@@ -2039,14 +2037,14 @@
      
      
      
-     
+     
      
      
      
      
      
      
-     
+     
      
      
      
@@ -2056,40 +2054,41 @@
      
      
      
-     
+     
      
      
-     
-     
+     
+     
+     
      
      
      
-     
+     
+     
      
      
      
      
      
-     
+     
      
      
      
-     
+     
      
      
-     
+     
      
      
-     
-     
-     
-     
+     
      
+     
+     
+     
      
      
      
      
-     
      
      
      
@@ -2105,32 +2104,30 @@
      
      
      
-     
-     
-     
+     
+     
      
-     
+     
      
      
      
      
      
      
-     
+     
      
      
-     
      
      
      
      
      
      
-     
+     
      
-     
+     
      
-     
+     
      
      
      
@@ -2146,23 +2143,26 @@
      
      
      
-     
-     
-     
+     
+     
+     
      
-     
+     
      
-     
+     
      
      
      
      
      
      
+     
      
-     
+     
      
+     
      
+     
      
      
      
@@ -2175,8 +2175,10 @@
      
      
      
+     
      
      
+     
      
      
      
@@ -2185,9 +2187,9 @@
      
      
      
-     
+     
      
-     
+     
      
      
      
@@ -2195,25 +2197,26 @@
      
      
      
+     
      
      
      
      
      
      
-     
+     
      
      
      
-     
+     
      
      
      
      
      
-     
+     
      
-     
+     
      
      
      
@@ -2222,7 +2225,7 @@
      
      
      
-     
+     
      
      
      
@@ -2237,28 +2240,29 @@
      
      
      
-     
+     
      
      
      
      
      
-     
+     
+     
      
      
-     
+     
      
      
      
      
      
      
-     
+     
      
      
      
      
-     
+     
      
      
      
@@ -2266,9 +2270,9 @@
      
      
      
-     
+     
      
-     
+     
      
      
      
@@ -2284,16 +2288,15 @@
      
      
      
-     
+     
      
-     
+     
      
-     
      
      
      
      
-     
+     
      
      
      
@@ -2309,7 +2312,7 @@
      
      
      
-     
+     
      
      
      
@@ -2323,14 +2326,14 @@
      
      
      
-     
+     
      
      
      
      
      
      
-     
+     
      
      
      
@@ -2345,41 +2348,39 @@
      
      
      
-     
+     
      
      
      
      
      
      
-     
+     
      
      
      
      
-     
-     
+     
+     
      
-     
-     
+     
      
      
-     
-     
+     
      
-     
+     
      
-     
+     
      
-     
+     
      
      
      
      
      
-     
+     
      
-     
+     
      
      
      
@@ -2389,17 +2390,17 @@
      
      
      
-     
+     
      
      
      
      
      
      
-     
+     
      
      
-     
+     
      
      
      
@@ -2407,18 +2408,18 @@
      
      
      
-     
+     
+     
      
      
      
      
      
      
-     
+     
      
-     
      
-     
+     
      
      
      
@@ -2432,7 +2433,7 @@
      
      
      
-     
+     
      
      
      
@@ -2448,40 +2449,41 @@
      
      
      
-     
+     
      
      
-     
+     
      
      
      
-     
+     
      
      
      
      
      
-     
      
      
      
-     
+     
      
-     
+     
      
-     
+     
+     
      
-     
+     
      
      
+     
      
      
-     
+     
      
      
-     
-     
-     
+     
+     
+     
      
      
      
@@ -2491,35 +2493,34 @@
      
      
      
-     
      
-     
      
      
      
      
      
      
-     
+     
      
      
      
-     
+     
      
      
      
-     
+     
      
-     
+     
+     
      
-     
+     
      
      
-     
-     
+     
+     
      
      
-     
+     
      
      
      
@@ -2539,12 +2540,12 @@
      
      
      
-     
+     
      
      
      
      
-     
+     
      
     
     
@@ -2567,26 +2568,26 @@
      
      
      
+     
+     
      
+     
+     
+     
+     
+     
      
      
      
-     
-     
+     
      
      
      
      
      
-     
-     
-     
      
      
-     
-     
      
-     
      
      
     
@@ -2595,41 +2596,41 @@
      API of the XML streaming API based on C# interfaces. 
      Daniel Veillard 
      
-     
-     
      
-     
-     
-     
-     
+     
      
-     
-     
-     
      
-     
      
-     
      
-     
-     
-     
+     
      
      
-     
+     
      
      
-     
      
      
      
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
-     
      
-     
      
+     
+     
      
      
      
@@ -2643,21 +2644,21 @@
      
      
      
-     
      
      
      
      
      
      
+     
      
      
      
      
      
      
-     
-     
+     
+     
      
      
      
@@ -2672,7 +2673,7 @@
      
      
      
-     
+     
      
      
      
@@ -2691,7 +2692,7 @@
      
      
      
-     
+     
      
      
      
@@ -2703,14 +2704,14 @@
      
      
      
-     
+     
      
      
      
      
      
-     
-     
+     
+     
      
     
     
@@ -2722,14 +2723,14 @@
      
      
      
-     
+     
      
      
-     
      
-     
-     
      
+     
+     
+     
      
     
     
@@ -2739,12 +2740,12 @@
      
      
      
-     
      
      
-     
-     
      
+     
+     
+     
      
      
     
@@ -2754,31 +2755,31 @@
      Daniel Veillard 
      
      
-     
-     
-     
-     
-     
      
-     
-     
-     
-     
-     
-     
-     
+     
      
-     
-     
+     
+     
      
-     
+     
+     
      
      
-     
      
      
-     
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
@@ -2790,22 +2791,22 @@
      
      
      
+     
      
      
      
      
-     
+     
      
      
      
      
      
      
-     
-     
-     
      
-     
+     
+     
+     
      
     
     
@@ -2818,9 +2819,9 @@
      
      
      
-     
-     
      
+     
+     
      
      
      
@@ -2829,7 +2830,7 @@
      
      
      
-     
+     
      
      
     
@@ -2840,126 +2841,168 @@
      
      
      
-     
-     
      
-     
-     
-     
      
      
-     
-     
      
-     
-     
+     
      
-     
      
-     
-     
-     
      
      
-     
-     
-     
-     
-     
      
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
     
     
      Unicode character APIs
      API for the Unicode character APIs  This file is automatically generated from the UCS description files of the Unicode Character Database
      Daniel Veillard 
      
-     
-     
-     
      
-     
      
-     
+     
      
-     
-     
+     
      
-     
      
-     
+     
      
-     
-     
-     
+     
      
-     
-     
-     
+     
+     
      
-     
      
-     
-     
-     
      
-     
-     
-     
      
-     
-     
-     
-     
-     
-     
-     
-     
-     
      
+     
+     
+     
+     
+     
      
      
-     
+     
      
-     
      
-     
-     
-     
+     
      
-     
+     
      
-     
      
      
      
-     
-     
      
-     
      
      
      
-     
      
-     
      
      
-     
-     
-     
      
-     
      
-     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
-     
      
      
-     
-     
-     
+     
      
      
      
@@ -2969,115 +3012,73 @@
      
      
      
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
      
+     
+     
+     
+     
+     
+     
      
      
      
-     
-     
-     
      
-     
-     
+     
      
-     
-     
      
      
      
      
      
-     
      
-     
-     
-     
-     
-     
-     
-     
-     
+     
+     
+     
      
-     
-     
-     
-     
-     
-     
-     
+     
+     
      
-     
-     
-     
+     
+     
      
-     
     
     
      compile-time version informations
      compile-time version informations for the XML library 
      Daniel Veillard 
-     
      
      
-     
      
-     
-     
-     
      
-     
-     
+     
      
-     
      
      
      
-     
-     
      
-     
      
-     
-     
-     
-     
      
-     
+     
      
      
      
      
-     
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
@@ -3095,7 +3096,7 @@
      
      
      
-     
+     
      
      
      
@@ -3109,6 +3110,7 @@
      
      
      
+     
      
      
      
@@ -3116,18 +3118,17 @@
      
      
      
-     
+     
      
      
      
      
      
-     
      
      
      
      
-     
+     
      
      
      
@@ -3136,9 +3137,8 @@
      
      
      
+     
      
-     
-     
      
      
      
@@ -3159,7 +3159,8 @@
      
      
      
-     
+     
+     
      
      
      
@@ -3179,262 +3180,262 @@
      
      
      
-     
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
      
-     
-     
-     
      
      
      
-     
-     
-     
      
      
      
-     
      
-     
      
-     
+     
      
      
-     
-     
-     
-     
      
-     
      
      
      
-     
-     
+     
+     
      
      
-     
-     
+     
+     
      
-     
      
      
      
      
      
      
+     
      
-     
+     
      
      
      
-     
      
+     
+     
      
      
-     
      
      
      
      
-     
      
-     
+     
      
-     
+     
      
      
-     
-     
-     
      
      
-     
-     
-     
+     
      
-     
-     
+     
      
      
      
-     
-     
-     
-     
+     
+     
      
-     
-     
-     
-     
+     
      
-     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
-     
-     
-     
      
-     
-     
-     
      
     
     
      internal interfaces for XML Path Language implementation
      internal interfaces for XML Path Language implementation used to build new modules on top of XPath like XPointer and XSLT 
      Daniel Veillard 
-     
      
      
      
-     
-     
-     
      
      
-     
      
-     
-     
      
-     
      
-     
-     
      
-     
-     
-     
-     
-     
      
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
-     
-     
      
-     
      
-     
-     
      
-     
      
-     
      
-     
      
      
-     
      
-     
-     
-     
      
      
      
      
-     
      
-     
-     
-     
-     
      
-     
-     
+     
      
      
      
-     
-     
+     
+     
      
-     
-     
+     
+     
      
-     
      
      
      
      
-     
      
-     
      
      
-     
-     
-     
      
      
-     
      
-     
-     
      
-     
      
      
      
      
      
-     
-     
+     
      
      
      
-     
-     
-     
      
      
-     
      
      
-     
      
      
-     
-     
-     
      
-     
      
      
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
      
-     
      
      
      
      
-     
+     
      
      
-     
-     
-     
-     
+     
+     
+     
      
-     
      
-     
-     
      
-     
-     
-     
+     
     
     
      API to handle XML Pointers
@@ -3446,23 +3447,23 @@
      
      
      
-     
      
-     
-     
      
+     
+     
      
      
      
      
      
-     
+     
      
+     
      
      
      
      
-     
+     
      
     
   
@@ -3528,8 +3529,12 @@
       The parser tries to always have that amount of input ready. One of the point is providing context when reporting errors.
     
     
+      Macro to check [0-9]
+      
     
     
+      Macro to check [a-zA-Z]
+      
     
     
       Macro to check the following production in the XML spec:  [85] BaseChar ::= ... long list see REC ...
@@ -3822,6 +3827,7 @@
       the attribute has a fixed value
     
     
+      allow elements in no namespace
     
     
       this is set when the "type" and "ref" references have been resolved.
@@ -3863,6 +3869,7 @@
       disallowed substitutions: "substituion"
     
     
+      a helper flag for the search of circular references.
     
     
       the element has a default value
@@ -3871,8 +3878,10 @@
       substitution group exclusions are absent
     
     
+      substitution group exclusions: "extension"
     
     
+      substitution group exclusions: "restriction"
     
     
       the element has a fixed value
@@ -3881,6 +3890,7 @@
       the element is global
     
     
+      this is set when "type", "ref", "substitutionGroup" references have been resolved.
     
     
       the element is nillable
@@ -3937,8 +3947,10 @@
       the complexType has a 'block' of "extension".
     
     
+      the complexType has a 'block' of "restriction".
     
     
+      Marks the item as a builtin primitive.
     
     
       the simple or complex type has a derivation method of "extension".
@@ -3947,6 +3959,7 @@
       the simple or complex type has a derivation method of "restriction".
     
     
+      the simpleType has a final of "default".
     
     
       the complexType has a final of "extension".
@@ -3964,6 +3977,7 @@
       the type is global
     
     
+      Marks the item as marked; used for circular checks.
     
     
       the element content type is mixed
@@ -6300,7 +6314,7 @@ actually an xmlCharEncoding'/>
     
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Take a block of UTF-8 chars in and try to convert it to an ASCII plus HTML entities block of chars out.
       
       
@@ -6309,6 +6323,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_OUTPUT_ENABLED)
       Take a block of UTF-8 chars in and try to convert it to an ISO Latin 1 block of chars out.
       
       
@@ -6317,7 +6332,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Handle an attribute that has been read by the parser. The default handling is to convert the attribute into an DOM subtree and past it in a new xmlAttr element added to the element. DEPRECATED: use xmlSAX2Attribute()
       
       
@@ -6325,7 +6340,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       An attribute definition has been parsed DEPRECATED: use xmlSAX2AttributeDecl()
       
       
@@ -6355,7 +6370,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       called when a pcdata block has been parsed DEPRECATED: use xmlSAX2CDataBlock()
       
       
@@ -6370,7 +6385,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       receiving some chars from the parser. DEPRECATED: use xmlSAX2Characters()
       
       
@@ -6385,14 +6400,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Check that the current element namespace is the same as the one read upon parsing. DEPRECATED
       
       
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       A comment has been parsed. DEPRECATED: use xmlSAX2Comment()
       
       
@@ -6405,14 +6420,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       Create a parser context for a file content. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.
       
       
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       Create a parser context for using the DocBook SGML parser in push mode To allow content encoding detection, @size should be >= 4 The value of @filename is used for fetching external entities and error/warning reports.
       
       
@@ -6423,11 +6438,12 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_DOCB_ENABLED)
       Initialize the default SAX handler
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       Take a block of UTF-8 chars in and try to convert it to an ASCII plus SGML entities block of chars out.
       
       
@@ -6437,13 +6453,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       Free all the memory used by a parser context. However the parsed document in ctxt->myDoc is not freed.
       
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       Parse a Chunk of memory
       
       
@@ -6452,27 +6468,27 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       parse an SGML in-memory document and build a tree.
       
       
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       parse an SGML document (and build a tree if using the standard SAX interface).
       
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       parse a Docbook SGML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.
       
       
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       parse an SGML in-memory document and build a tree. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.
       
       
@@ -6481,7 +6497,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       parse an SGML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.
       
       
@@ -6490,7 +6506,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       An element definition has been parsed DEPRECATED: use xmlSAX2ElementDecl()
       
       
@@ -6507,7 +6523,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       called when the document end has been detected. DEPRECATED: use xmlSAX2EndDocument()
       
       
@@ -6518,7 +6534,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       called when the end of an element has been detected. DEPRECATED: use xmlSAX2EndElement()
       
       
@@ -6539,7 +6555,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       An entity definition has been parsed DEPRECATED: use xmlSAX2EntityDecl()
       
       
@@ -6567,7 +6583,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Callback on external subset declaration. DEPRECATED: use xmlSAX2ExternalSubset()
       
       
@@ -6591,7 +6607,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       A callback for the xmlNanoFTPGet command.
       
       
@@ -6599,7 +6615,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       A callback for the xmlNanoFTPList command. Note that only one of year and day:minute are specified.
       
       
@@ -6616,13 +6632,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Provide the column number of the current parsing point. DEPRECATED: use xmlSAX2GetColumnNumber()
       
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Get an entity by name DEPRECATED: use xmlSAX2GetEntity()
       
       
@@ -6635,19 +6651,19 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Provide the line number of the current parsing point. DEPRECATED: use xmlSAX2GetLineNumber()
       
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Get the current element namespace. DEPRECATED
       
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Get a parameter entity by name DEPRECATED: use xmlSAX2GetParameterEntity()
       
       
@@ -6660,19 +6676,19 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Provides the public ID e.g. "-//SGMLSOURCE//DTD DEMO//EN" DEPRECATED: use xmlSAX2GetPublicId()
       
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Provides the system ID, basically URL or filename e.g. http://www.sgmlsource.com/dtds/memo.dtd DEPRECATED: use xmlSAX2GetSystemId()
       
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       An old global namespace has been parsed. DEPRECATED
       
       
@@ -6680,7 +6696,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Does this document has an external subset DEPRECATED: use xmlSAX2HasExternalSubset()
       
       
@@ -6691,7 +6707,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Does this document has an internal subset DEPRECATED: use xmlSAX2HasInternalSubset()
       
       
@@ -6702,7 +6718,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Checks whether an attribute is valid for an element Has full knowledge of Required and Deprecated attributes
       
       
@@ -6710,7 +6726,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if the element or one of it's children would autoclose the given tag.
       
       
@@ -6718,22 +6734,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Create a parser context for a file content. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Create a parser context for an HTML in-memory document.
       
       
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_PUSH_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_PUSH_ENABLED)
       Create a parser context for using the HTML parser in push mode The value of @filename is used for fetching external entities and error/warning reports.
       
       
@@ -6744,7 +6759,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an XML in-memory document and build a tree. This reuses the existing @ctxt parser context
       
       
@@ -6754,7 +6769,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an XML from a file descriptor and build a tree. This reuses the existing @ctxt parser context
       
       
@@ -6764,7 +6779,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an XML file from the filesystem or the network. This reuses the existing @ctxt parser context
       
       
@@ -6773,7 +6788,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an HTML document from I/O functions and source and build a tree. This reuses the existing @ctxt parser context
       
       
@@ -6785,7 +6800,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an XML in-memory document and build a tree. This reuses the existing @ctxt parser context
       
       
@@ -6796,25 +6811,25 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Reset a parser context
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Applies the options to the parser context
       
       
       
     
     
+      defined(LIBXML_HTML_ENABLED)
       Initialize the default SAX handler
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML document.
       
       
@@ -6823,8 +6838,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML document. Formating return/spaces are added.
       
       
@@ -6832,16 +6846,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML document to an open FILE.
       
       
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML document in memory and return the xmlChar * and it's size. It's up to the caller to free the memory.
       
       
@@ -6849,21 +6861,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Checks whether an HTML element may be a direct child of a parent element. Note - doesn't check for deprecated elements
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Checks whether an HTML element may be a direct child of a parent element. and if so whether it is valid or deprecated.
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Take a block of UTF-8 chars in and try to convert it to an ASCII plus HTML entities block of chars out.
       
       
@@ -6873,76 +6885,75 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Lookup the given entity in EntitiesTable  TODO: the linear scan is really ugly, an hash table is really needed.
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Lookup the given entity in EntitiesTable  TODO: the linear scan is really ugly, an hash table is really needed.
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Free all the memory used by a parser context. However the parsed document in ctxt->myDoc is not freed.
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Encoding definition lookup in the Meta tags
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Set and return the previous value for handling HTML omitted tags.
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Initialize the htmlStartCloseIndex for fast lookup of closing tags names. This is not reentrant. Call xmlInitParser() once before processing in case of use in multithreaded programs.
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if a tag is autoclosed by one of it's child
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Determine if a given attribute is a boolean attribute.
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Check if an attribute is of content type Script
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Creates a new HTML document
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Creates a new HTML document without a DTD node if @URI and @ExternalID are NULL
       
       
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML node, recursive behaviour,children are printed too, and formatting returns are added.
       
       
@@ -6950,8 +6961,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML node, recursive behaviour,children are printed too, and formatting returns are added.
       
       
@@ -6959,8 +6969,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML node, recursive behaviour,children are printed too.  TODO: if encoding == NULL try to save in the doc encoding
       
       
@@ -6970,8 +6979,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML node, recursive behaviour,children are printed too.
       
       
@@ -6981,8 +6989,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML node, recursive behaviour,children are printed too, and formatting returns/spaces are added.
       
       
@@ -6991,21 +6998,20 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Checks whether the tree node is valid.  Experimental (the author only uses the HTML enhancements in a SAX parser)
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse Reference declarations  [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'
       
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_PUSH_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_PUSH_ENABLED)
       Parse a Chunk of memory
       
       
@@ -7014,40 +7020,40 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an HTML in-memory document and build a tree.
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an HTML document (and build a tree if using the standard SAX interface).
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an HTML element, this is highly recursive  [39] element ::= EmptyElemTag | STag content ETag  [41] Attribute ::= Name Eq AttValue
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an HTML ENTITY references  [68] EntityRef ::= '&' Name ';'
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an HTML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an XML in-memory document and build a tree.
       
       
@@ -7056,7 +7062,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an XML from a file descriptor and build a tree.
       
       
@@ -7065,7 +7071,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an XML file from the filesystem or the network.
       
       
@@ -7073,7 +7079,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an HTML document from I/O functions and source and build a tree.
       
       
@@ -7084,7 +7090,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an XML in-memory document and build a tree.
       
       
@@ -7094,7 +7100,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Parse an HTML in-memory document. If sax is not NULL, use the SAX callbacks to handle parse events. If sax is NULL, fallback to the default DOM behavior and return a tree.
       
       
@@ -7103,7 +7109,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       parse an HTML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.
       
       
@@ -7112,16 +7118,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML document to a file. If @filename is "-" the stdout file is used.
       
       
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML document to a file using a given encoding and formatting returns/spaces are added.
       
       
@@ -7129,8 +7133,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML document to a file using a given encoding.
       
       
@@ -7139,20 +7142,20 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Sets the current encoding in the Meta tags NOTE: this will not change the document content encoding, just the META flag associated.
       
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Lookup the HTML tag in the ElementTable
       
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       receiving some ignorable whitespaces from the parser. UNUSED: by default the DOM building will use characters DEPRECATED: use xmlSAX2IgnorableWhitespace()
       
       
@@ -7172,21 +7175,19 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_LEGACY_ENABLED) && defined(LIBXML_SAX1_ENABLED) && defined(LIBXML_DOCB_ENABLED)
       Initialize the default DocBook SAX version 1 handler DEPRECATED: use xmlSAX2InitDocbDefaultSAXHandler() for the new SAX2 blocks
       
       
     
     
-      LIBXML_SAX1_ENABLED
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_LEGACY_ENABLED) && defined(LIBXML_SAX1_ENABLED) && defined(LIBXML_HTML_ENABLED)
       Initialize the default HTML SAX version 1 handler DEPRECATED: use xmlSAX2InitHtmlDefaultSAXHandler() for the new SAX2 blocks
       
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED) && defined(LIBXML_SAX1_ENABLED)
       Initialize the default XML SAX version 1 handler DEPRECATED: use xmlSAX2InitDefaultSAXHandler() for the new SAX2 blocks
       
       
@@ -7204,7 +7205,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Callback on internal subset declaration. DEPRECATED: use xmlSAX2InternalSubset()
       
       
@@ -7221,7 +7222,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Is this document tagged standalone ? DEPRECATED: use xmlSAX2IsStandalone()
       
       
@@ -7251,7 +7252,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       A namespace has been parsed. DEPRECATED
       
       
@@ -7270,7 +7271,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       What to do when a notation declaration has been parsed. DEPRECATED: use xmlSAX2NotationDecl()
       
       
@@ -7287,7 +7288,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       A processing instruction has been parsed. DEPRECATED: use xmlSAX2ProcessingInstruction()
       
       
@@ -7302,7 +7303,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       called when an entity reference is detected. DEPRECATED: use xmlSAX2Reference()
       
       
@@ -7315,7 +7316,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       The entity loader, to control the loading of external entities, the application can either: - override this resolveEntity() callback in the SAX block - or better use the xmlSetExternalEntityLoader() function to set up it's own entity resolution routine DEPRECATED: use xmlSAX2ResolveEntity()
       
       
@@ -7330,7 +7331,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Receive the document locator at startup, actually xmlDefaultSAXLocator Everything is available on the context, so this is useless in our case. DEPRECATED
       
       
@@ -7343,14 +7344,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       Set the current element namespace. DEPRECATED
       
       
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       called when the document start being processed. DEPRECATED: use xmlSAX2StartDocument()
       
       
@@ -7361,7 +7362,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       called when an opening tag has been processed. DEPRECATED: use xmlSAX2StartElement()
       
       
@@ -7389,7 +7390,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SAX1_ENABLED
+      defined(LIBXML_LEGACY_ENABLED)
       What to do when an unparsed entity declaration is parsed DEPRECATED: use xmlSAX2UnparsedEntityDecl()
       
       
@@ -7408,13 +7409,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Pops the top XPath object from the value stack
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Pushes a new XPath object on top of the value stack
       
       
@@ -7428,6 +7429,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_XPTR_ENABLED)
       This is the prototype for a extended link detection callback.
       
       
@@ -7445,6 +7447,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_XPTR_ENABLED)
       This is the prototype for a extended link set detection callback.
       
       
@@ -7457,36 +7460,43 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_XPTR_ENABLED)
       Get the default xlink detection routine
       
     
     
+      defined(LIBXML_XPTR_ENABLED)
       Get the default xlink handler.
       
     
     
+      defined(LIBXML_XPTR_ENABLED)
       Check whether the given node carries the attributes needed to be a link element (or is one of the linking elements issued from the (X)HTML DtDs). This routine don't try to do full checking of the link validity but tries to detect and return the appropriate link type.
       
       
       
     
     
+      defined(LIBXML_XPTR_ENABLED)
       This is the prototype for the link detection routine. It calls the default link detection callbacks upon link detection.
       
       
       
     
     
+      defined(LIBXML_XPTR_ENABLED)
       Set the default xlink detection routine
       
       
     
     
+      defined(LIBXML_XPTR_ENABLED)
       Set the default xlink handlers
       
       
     
     
+      defined(LIBXML_XPTR_ENABLED)
       This is the prototype for a simple link detection callback.
       
       
@@ -7496,7 +7506,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Add an entry in the catalog, it may overwrite existing but different entries.
       
       
@@ -7505,22 +7515,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump the given catalog to the given file.
       
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Remove an entry from the catalog
       
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Do a complete resolution lookup of an External Identifier
       
       
@@ -7528,21 +7537,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Try to lookup the catalog local reference associated to a public ID in that catalog
       
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Try to lookup the catalog resource for a system ID
       
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Do a complete resolution lookup of an URI
       
       
@@ -7632,7 +7641,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Add a new node @elem as the previous sibling of @cur merging adjacent TEXT nodes (@elem may be freed) If the new node was already inserted in a document it is first unlinked from its existing context. If the new node is ATTRIBUTE, it is added into properties instead of children. If there is an attribute with equal name, it is first destroyed.
       
       
@@ -7653,7 +7662,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Create a buffered parser output
       
       
@@ -7664,6 +7673,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_OUTPUT_ENABLED)
       Serialize text attribute values to an xml simple buffer
       
       
@@ -7672,25 +7682,25 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       Compile the automata into a Reg Exp ready for being executed. The automata should be free after this point.
       
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       Initial state lookup
       
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       Checks if an automata is determinist.
       
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds a an ALL transition from the @from state to the target state. That transition is an epsilon transition allowed only when all transitions from the @from node have been activated.
       
       
@@ -7699,7 +7709,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by a succession of input of value @token and whose number is between @min and @max
       
       
@@ -7711,7 +7721,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by a succession of input of value @token and @token2 and whose number is between @min and @max
       
       
@@ -7724,7 +7734,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds an epsilon transition from the @from state to the target state which will increment the counter provided
       
       
@@ -7733,7 +7743,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       Create a new counter
       
       
@@ -7741,7 +7751,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds an epsilon transition from the @from state to the target state which will be allowed only if the counter is within the right range.
       
       
@@ -7750,7 +7760,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds an epsilon transition from the @from state to the target state
       
       
@@ -7758,7 +7768,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by a succession of input of value @token and whose number is between @min and @max, moreover that transition can only be crossed once.
       
       
@@ -7770,7 +7780,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by a succession of input of value @token and @token2 and whose number is between @min and @max, moreover that transition can only be crossed once.
       
       
@@ -7783,13 +7793,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       Create a new disconnected state in the automata
       
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by the value of @token
       
       
@@ -7799,7 +7809,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by the value of @token
       
       
@@ -7810,14 +7820,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       Makes that state a final state
       
       
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Convenient way to turn bool into text
       
       
@@ -7957,8 +7967,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_C14N_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dumps the canonized image of given XML document into memory. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
       
       
@@ -7969,8 +7978,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_C14N_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dumps the canonized image of given XML document into the file. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
       
       
@@ -7982,8 +7990,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_C14N_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dumps the canonized image of given XML document into the provided buffer. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
       
       
@@ -7994,8 +8001,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_C14N_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dumps the canonized image of given XML document into the provided buffer. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
       
       
@@ -8007,8 +8013,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_C14N_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       
       
       
@@ -8021,7 +8026,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Add an entry in the catalog, it may overwrite existing but different entries. If called before any other catalog routine, allows to override the default shared catalog put in place by xmlInitializeCatalog();
       
       
@@ -8029,60 +8034,59 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Add the new entry to the catalog list
       
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Free up all the memory associated with catalogs
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Convert all the SGML catalog entries as XML ones
       
     
     
-      LIBXML_CATALOG_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump all the global catalog content to the given file.
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Free up the memory associated to the catalog list
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Used to get the user preference w.r.t. to what catalogs should be accepted
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Try to lookup the catalog reference associated to a public ID DEPRECATED, use xmlCatalogResolvePublic()
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Try to lookup the catalog reference associated to a system ID DEPRECATED, use xmlCatalogResolveSystem()
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Check is a catalog is empty
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Do a complete resolution lookup of an External Identifier using a document's private catalog list
       
       
@@ -8090,57 +8094,57 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Do a complete resolution lookup of an URI using a document's private catalog list
       
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Remove an entry from the catalog
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Do a complete resolution lookup of an External Identifier
       
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Try to lookup the catalog reference associated to a public ID
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Try to lookup the catalog resource for a system ID
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Do a complete resolution lookup of an URI
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Used to set the debug level for catalog operation, 0 disable debugging, 1 enable it
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Allows to set the preference between public and system for deletion in XML Catalog resolution. C.f. section 4.1.1 of the spec Values accepted are XML_CATA_PREFER_PUBLIC or XML_CATA_PREFER_SYSTEM
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Used to set the user preference w.r.t. to what catalogs should be accepted
       
       
@@ -8251,7 +8255,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       clears the entire output callback table. this includes the compiled-in I/O callbacks.
       
     
@@ -8260,6 +8264,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Cleanup up the predefined entities table. Deprecated call
       
     
@@ -8278,12 +8283,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Convert all the SGML catalog entries as XML ones
       
       
     
     
+      defined(LIBXML_TREE_ENABLED)
       Build a copy of an attribute table.
       
       
@@ -8302,14 +8308,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Do a copy of the document info. If recursive, the content tree will be copied too as well as DTD, namespaces and entities.
       
       
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED)
       Do a copy of the dtd.
       
       
@@ -8320,16 +8326,19 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_TREE_ENABLED)
       Build a copy of an element table.
       
       
     
     
+      defined(LIBXML_TREE_ENABLED)
       Build a copy of an entity table.
       
       
     
     
+      defined(LIBXML_TREE_ENABLED)
       Copy an enumeration attribute node (recursive).
       
       
@@ -8362,6 +8371,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_TREE_ENABLED)
       Build a copy of a notation table.
       
       
@@ -8429,7 +8439,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_PUSH_ENABLED
+      defined(LIBXML_PUSH_ENABLED)
       Create a parser context for using the XML parser in push mode. If @buffer and @size are non-NULL, the data is used to detect the encoding.  The remaining characters will be parsed so they don't need to be fed in again through xmlParseChunk. To allow content encoding detection, @size should be >= 4 The value of @filename is used for fetching external entities and error/warning reports.
       
       
@@ -8532,14 +8542,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Check the document for potential content problems, and output the errors to @output
       
       
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps debug information for the attribute
       
       
@@ -8547,7 +8557,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps debug information for the attribute list
       
       
@@ -8555,35 +8565,35 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps debug information for the DTD
       
       
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps debug information for the document, it's recursive
       
       
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps debug information cncerning the document, not recursive
       
       
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps debug information for all the entities in use by the document
       
       
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps debug information for the element node, it is recursive
       
       
@@ -8591,7 +8601,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps debug information for the list of element node, it is recursive
       
       
@@ -8599,7 +8609,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps debug information for the element node, it is not recursive
       
       
@@ -8607,13 +8617,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dumps informations about the string, shorten it if necessary
       
       
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       This function is deprecated, we now always process entities content through xmlStringDecodeEntities  TODO: remove it in next major release.  [67] Reference ::= EntityRef | CharRef  [69] PEReference ::= '%' Name ';'
       
       
@@ -8713,14 +8724,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document to an open FILE.
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document in memory and return the #xmlChar * and it's size. It's up to the caller to free the memory with xmlFree(). Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called
       
       
@@ -8729,7 +8740,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump the current DOM tree into memory using the character encoding specified by the caller.  Note it is up to the caller of this function to free the allocated memory with xmlFree(). Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called
       
       
@@ -8739,7 +8750,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document in memory and return the #xmlChar * and it's size in bytes. It's up to the caller to free the memory with xmlFree(). The resulting byte array is zero terminated, though the last 0 is not included in the returned size.
       
       
@@ -8747,7 +8758,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump the current DOM tree into memory using the character encoding specified by the caller.  Note it is up to the caller of this function to free the allocated memory with xmlFree().
       
       
@@ -8756,7 +8767,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document to an open FILE.
       
       
@@ -8769,70 +8780,70 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
       Set the root element of the document (doc->children is a list containing possibly comments, PIs, etc ...).
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       This will dump the content of the attribute declaration as an XML DTD definition
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       This will dump the content of the attribute table as an XML DTD definition
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       This will dump the content of the element declaration as an XML DTD definition
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       This will dump the content of the element table as an XML DTD definition
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       This will dump the content of the entity table as an XML DTD definition
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       This will dump the content of the entity table as an XML DTD definition
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       This will dump the content the notation declaration as an XML DTD definition
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       This will dump the content of the notation table as an XML DTD definition
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML/HTML node, recursive behaviour, children are printed too.
       
       
@@ -8840,6 +8851,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       TODO: remove xmlEncodeEntities, once we are not afraid of breaking binary compatibility  People must migrate their code to xmlEncodeEntitiesReentrant ! This routine will issue a warning when encountered.
       
       
@@ -8858,6 +8870,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Callback function used when one needs to be able to track back the provenance of a chunk of nodes inherited from an entity replacement.
       
       
@@ -8910,13 +8923,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       Free an automata
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Free the memory allocated to a Catalog
       
       
@@ -9007,13 +9020,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_PATTERN_ENABLED
+      defined(LIBXML_PATTERN_ENABLED)
       Free up the memory allocated by @comp
       
       
     
     
-      LIBXML_PATTERN_ENABLED
+      defined(LIBXML_PATTERN_ENABLED)
       Free up the memory allocated by all the elements of @comp
       
       
@@ -9039,13 +9052,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Deallocate all the resources associated to the reader
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Deallocate all the resources associated to the writer
       
       
@@ -9056,6 +9069,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_VALID_ENABLED)
       Free a validation context structure.
       
       
@@ -9164,6 +9178,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Read the current value of one feature of this parser instance
       
       
@@ -9171,6 +9186,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Copy at most *@len feature names into the @result array
       
       
@@ -9212,13 +9228,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
       Build a structure based Path for the given node
       
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED)
       Search all the namespace applying to a given element.
       
       
@@ -9265,6 +9281,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Default handling of defined entities, when should we define a new input stream ? When do we just handle that as a set of chars ?  OBSOLETE: to be removed at some point.
       
       
@@ -9491,25 +9508,25 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Close an FTP I/O channel
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       check if the URI matches an FTP one
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       open an FTP I/O channel
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Read @len bytes to @buffer from the I/O channel.
       
       
@@ -9517,32 +9534,32 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Close an HTTP I/O channel
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       check if the URI matches an HTTP one
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       open an HTTP I/O channel
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Open a temporary buffer to collect the document for a subsequent HTTP POST request.  Non-static as is called from the output buffer creation routine.
       
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Read @len bytes to @buffer from the I/O channel.
       
       
@@ -9550,6 +9567,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_VALID_ENABLED)
       Load and parse a DTD
       
       
@@ -9587,7 +9605,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Do the catalog initialization. this function is not thread safe, catalog initialization should preferably be done once at startup
       
     
@@ -9597,6 +9615,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Set up the predefined entities. Deprecated call
       
     
@@ -9876,19 +9895,19 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Load the catalog and build the associated data structures. This can be either an XML Catalog or an SGML Catalog It will recurse in SGML CATALOG entries. On the other hand XML Catalogs are not handled recursively.
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Load the catalog and makes its definitions effective for the default external entity loader. It will recurse in SGML CATALOG entries. this function is not thread safe, catalog initialization should preferably be done once at startup
       
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Load the catalogs and makes their definitions effective for the default external entity loader. this function is not thread safe, catalog initialization should preferably be done once at startup
       
       
@@ -9901,7 +9920,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       Load an SGML super catalog. It won't expand CATALOG or DELEGATE references. This is only needed for manipulating SGML Super Catalogs like adding and removing CATALOG or DELEGATE entries.
       
       
@@ -9911,13 +9930,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Count the children of @node.
       
       
     
     
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_DEBUG_ENABLED)
       Dump to @output the type and name of @node.
       
       
@@ -9952,9 +9971,9 @@ actually an xmlCharEncoding'/>
       
     
     
-      a free() equivalent, with error checking.
+      
       
-      
+      
     
     
       Provides the memory access functions set currently in use
@@ -9965,15 +9984,15 @@ actually an xmlCharEncoding'/>
       
     
     
-      a malloc() equivalent, with logging of the allocation info.
-      
-      
+      
+      
+      
     
     
-      a realloc() equivalent, with logging of the allocation info.
-      
-      
-      
+      
+      
+      
+      
     
     
       Override the default memory access functions with a new set This has to be called before any other libxml routines !  Should this be blocked if there was already some allocations done ?
@@ -10005,9 +10024,9 @@ actually an xmlCharEncoding'/>
       
     
     
-      a strdup() equivalent, with logging of the allocation info.
-      
-      
+      
+      
+      
     
     
       xmlMutexLock() is used to lock a libxml2 token.
@@ -10020,79 +10039,82 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       parse an XML namespace name.  TODO: this seems not in use anymore, the namespace handling is done on top of the SAX interfaces, i.e. not on raw input.  [NS 3] NCName ::= (Letter | '_') (NCNameChar)*  [NS 4] NCNameChar ::= Letter | Digit | '.' | '-' | '_' | CombiningChar | Extender
       
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       parse a namespace prefix declaration  TODO: this seems not in use anymore, the namespace handling is done on top of the SAX interfaces, i.e. not on raw input.  [NS 1] NSDef ::= PrefixDef Eq SystemLiteral  [NS 2] PrefixDef ::= 'xmlns' (':' NCName)?
       
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       TODO: this seems not in use anymore, the namespace handling is done on top of the SAX interfaces, i.e. not on raw input.  parse an XML qualified name  [NS 5] QName ::= (Prefix ':')? LocalPart  [NS 6] Prefix ::= NCName  [NS 7] LocalPart ::= NCName
       
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Check if there is a response from the FTP server after a command.
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Cleanup the FTP protocol layer. This cleanup proxy informations.
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Close the connection and both control and transport
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Close the data connection from the server
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Tries to open a control connection
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Tries to open a control connection to the given server/port
       
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Tries to change the remote directory
       
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Tries to delete an item (file or directory) from server
       
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Frees the context after closing the connection.
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Fetch the given file from the server. All data are passed back in the callbacks. The last callback has a size of 0 block.
       
       
@@ -10101,31 +10123,31 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Try to open a data connection to the server. Currently only passive mode is supported.
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Get the response from the FTP server after a command.
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Initiate fetch of the given file from the server.
       
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Initialize the FTP protocol layer. Currently it just checks for proxy informations, and get the hostname
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Do a listing on the server. All files info are passed back in the callbacks.
       
       
@@ -10134,19 +10156,19 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Allocate and initialize a new FTP context.
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Start to fetch the given ftp:// resource
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Setup the FTP proxy informations. This can also be done by using ftp_proxy ftp_proxy_user and ftp_proxy_password environment variables.
       
       
@@ -10156,13 +10178,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Send a QUIT command to the server
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       This function tries to read @len bytes from the existing FTP connection and saves them in @dest. This is a blocking call.
       
       
@@ -10170,49 +10192,49 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       (Re)Initialize the FTP Proxy context by parsing the URL and finding the protocol host port it indicates. Should be like ftp://myproxy/ or ftp://myproxy:3128/ A NULL URL cleans up proxy informations.
       
       
     
     
-      LIBXML_FTP_ENABLED
+      defined(LIBXML_FTP_ENABLED)
       Update an FTP context by parsing the URL and finding new path it indicates. If there is an error in the protocol, hostname, port or other information, the error is raised. It indicates a new connection has to be established.
       
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Get the authentication header of an HTTP context
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Cleanup the HTTP protocol layer.
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       This function closes an HTTP context, it ends up the connection and free all data related to it.
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Provides the specified content length from the HTTP header.
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Provides the specified encoding if specified in the HTTP headers.
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       This function try to fetch the indicated resource via HTTP GET and save it's content in the file.
       
       
@@ -10220,12 +10242,12 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Initialize the HTTP protocol layer. Currently it just checks for proxy informations
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       This function try to open a connection to the indicated resource via HTTP using the given @method, adding the given extra headers and the input buffer for the request content.
       
       
@@ -10236,7 +10258,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       This function try to open a connection to the indicated resource via HTTP using the given @method, adding the given extra headers and the input buffer for the request content.
       
       
@@ -10248,20 +10270,20 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Provides the specified Mime-Type if specified in the HTTP headers.
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       This function try to open a connection to the indicated resource via HTTP GET.
       
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       This function try to open a connection to the indicated resource via HTTP GET.
       
       
@@ -10269,7 +10291,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       This function tries to read @len bytes from the existing HTTP connection and saves them in @dest. This is a blocking call.
       
       
@@ -10277,33 +10299,32 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Provides the specified redirection URL if available from the HTTP header.
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       Get the latest HTTP return code received
       
       
     
     
-      LIBXML_HTTP_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_HTTP_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       This function saves the output of the HTTP transaction to a file It closes and free the context at the end
       
       
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_HTTP_ENABLED)
       (Re)Initialize the HTTP Proxy context by parsing the URL and finding the protocol host port it indicates. Should be like http://myproxy/ or http://myproxy:3128/ A NULL URL cleans up proxy informations.
       
       
     
     
-      LIBXML_AUTOMATA_ENABLED
+      defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
       Create a new automata
       
     
@@ -10315,7 +10336,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       create a new Catalog.
       
       
@@ -10334,6 +10355,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @ns is NULL, the newly created element inherits the namespace of @parent. If @content is non NULL, a child list containing the TEXTs and ENTITY_REFs node will be created. NOTE: @content is supposed to be a piece of XML CDATA, so it allows entity references. XML special chars must be escaped first by using xmlEncodeEntitiesReentrant(), or xmlNewTextChild() should be used.
       
       
@@ -10358,7 +10380,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED)
       Creation of a new Fragment node.
       
       
@@ -10394,6 +10416,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_TREE_ENABLED)
       Creation of a new node element within a document. @ns and @content are optional (NULL).
       
       
@@ -10435,6 +10458,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Creation of a Namespace, the old way using PI and without scoping DEPRECATED !!! It now create a namespace on the root element of the document if found.
       
       
@@ -10509,6 +10533,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Create a new property carried by a node.
       
       
@@ -10537,6 +10562,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_TREE_ENABLED)
       Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @ns is NULL, the newly created element inherits the namespace of @parent. If @content is non NULL, a child TEXT node will be created containing the string @content. NOTE: Use xmlNewChild() if @content will contain entities that need to be preserved. Use this function, xmlNewTextChild(), if you need to ensure that reserved XML chars that might appear in @content, such as the ampersand, greater-than or less-than signs, are automatically replaced by their XML escaped entity representations.
       
       
@@ -10551,54 +10577,54 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Create an xmlTextReader structure fed with @input
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Create an xmlTextReader structure fed with the resource at @URI
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Create a new xmlNewTextWriter structure using an xmlOutputBufferPtr NOTE: the @out parameter will be deallocated when the writer is closed (if the call succeed.)
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Create a new xmlNewTextWriter structure with @*doc as output
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Create a new xmlNewTextWriter structure with @uri as output
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Create a new xmlNewTextWriter structure with @buf as output TODO: handle compression
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Create a new xmlNewTextWriter structure with @ctxt as output NOTE: the @ctxt context will be freed with the resulting writer (if the call succeeds). TODO: handle compression
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Create a new xmlNewTextWriter structure with @doc as output starting at @node
       
       
@@ -10606,6 +10632,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_VALID_ENABLED)
       Allocate a validation context structure.
       
     
@@ -10641,7 +10668,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called
       
       
@@ -10651,7 +10678,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML node, recursive behaviour, children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called
       
       
@@ -10688,7 +10715,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED)
       Builds the string equivalent to the text contained in the Node list made of TEXTs and ENTITY_REFs, contrary to xmlNodeListGetString() this function doesn't do any character encoding handling.
       
       
@@ -10703,7 +10730,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED)
       Set (or reset) the base URI of a node, i.e. the value of the xml:base attribute.
       
       
@@ -10716,7 +10743,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED)
       Replace the content of a node.
       
       
@@ -10724,21 +10751,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED)
       Set the language of a node, i.e. the values of the xml:lang attribute.
       
       
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED)
       Set (or reset) the name of a node.
       
       
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED)
       Set (or reset) the space preserving behaviour of a node, i.e. the value of the xml:space attribute.
       
       
@@ -10755,27 +10782,27 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       flushes and close the output I/O channel and free up all the associated resources
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Create a buffered output for the progressive saving to a file descriptor
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Create a buffered output for the progressive saving to a FILE * buffered C I/O
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Create a buffered  output for the progressive saving of a file If filename is "-' then we use stdout as the output. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. TODO: currently if compression is set, the library only support writing to a local file.
       
       
@@ -10795,7 +10822,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Create a buffered output for the progressive saving to an I/O handler
       
       
@@ -10804,13 +10831,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       flushes the output I/O channel
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Write the content of the array in the output I/O buffer This routine handle the I18N transcoding from internal UTF-8 The buffer is lossless, i.e. will store in case of partial or delayed writes.
       
       
@@ -10818,7 +10845,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Write the content of the string in the output I/O buffer This routine escapes the caracters and then handle the I18N transcoding from internal UTF-8 The buffer is lossless, i.e. will store in case of partial or delayed writes.
       
       
@@ -10826,32 +10853,32 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Write the content of the string in the output I/O buffer This routine handle the I18N transcoding from internal UTF-8 The buffer is lossless, i.e. will store in case of partial or delayed writes.
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Callback used in the I/O Output API to close the resource
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Callback used in the I/O Output API to detect if the current handler can provide output fonctionnalities for this resource.
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Callback used in the I/O Output API to open the resource
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Callback used in the I/O Output API to write to the resource
       
       
@@ -10864,6 +10891,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an attribute  [41] Attribute ::= Name Eq AttValue  [ WFC: No External Entity References ] Attribute values cannot contain direct or indirect entity references to external entities.  [ WFC: No < in Attribute Values ] The replacement text of any entity referred to directly or indirectly in an attribute value (other than "&lt;") must not contain a <.  [ VC: Attribute Value Type ] The attribute must have been declared; the value must be of the type declared for it.  [25] Eq ::= S? '=' S?  With namespace:  [NS 11] Attribute ::= QName Eq AttValue  Also the case QName == xmlns:??? is handled independently as a namespace definition.
       
       
@@ -10881,6 +10909,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       Parse a well-balanced chunk of an XML document called by the parser The allowed sequence for the Well Balanced Chunk is the one defined by the content production in the XML grammar:  [43] content ::= (element | CharData | Reference | CDSect | PI | Comment)*
       
       
@@ -10891,6 +10920,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       Parse a well-balanced chunk of an XML document called by the parser The allowed sequence for the Well Balanced Chunk is the one defined by the content production in the XML grammar:  [43] content ::= (element | CharData | Reference | CDSect | PI | Comment)*
       
       
@@ -10907,7 +10937,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_CATALOG_ENABLED
+      defined(LIBXML_CATALOG_ENABLED)
       parse an XML file and build a tree. It's like xmlParseFile() except it bypass all catalog lookups.
       
       
@@ -10929,7 +10959,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_PUSH_ENABLED
+      defined(LIBXML_PUSH_ENABLED)
       Parse a Chunk of memory
       
       
@@ -10956,6 +10986,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_VALID_ENABLED)
       Load and parse an external subset.
       
       
@@ -10968,6 +10999,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML in-memory document and build a tree.
       
       
@@ -11022,11 +11054,13 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an end of tag  [42] ETag ::= '</' Name S? '>'  With namespace  [NS 9] ETag ::= '</' QName S? '>'
       
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML external entity out of context and build a tree.  [78] extParsedEnt ::= TextDecl? content  This correspond to a "Well Balanced" chunk
       
       
@@ -11064,6 +11098,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       Parse an external general entity An external general parsed entity is well-formed if it matches the production labeled extParsedEnt.  [78] extParsedEnt ::= TextDecl? content
       
       
@@ -11089,6 +11124,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.
       
       
@@ -11108,6 +11144,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML in-memory block and build a tree.
       
       
@@ -11124,6 +11161,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       xmlParseNamespace: parse specific PI '<?namespace ...' constructs.  This is what the older xml-name Working Draft specified, a bunch of other stuff may still rely on it, so support is still here as if it was declared on the root of the Tree:-(  TODO: remove from library  To be removed at next drop of binary compatibility
       
       
@@ -11164,6 +11202,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Parse and return a string between quotes or doublequotes  TODO: Deprecated, to  be removed at next drop of binary compatibility
       
       
@@ -11179,6 +11218,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse a start of tag either for rule element or EmptyElement. In both case we don't parse the tag closing chars.  [40] STag ::= '<' Name (S Attribute)* S? '>'  [ WFC: Unique Att Spec ] No attribute name may appear more than once in the same start-tag or empty-element tag.  [44] EmptyElemTag ::= '<' Name (S Attribute)* S? '/>'  [ WFC: Unique Att Spec ] No attribute name may appear more than once in the same start-tag or empty-element tag.  With namespace:  [NS 8] STag ::= '<' QName (S Attribute)* S? '>'  [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>'
       
       
@@ -11255,6 +11295,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       TODO: Remove, now deprecated ... the test is done directly in the content parsing routines.  [67] Reference ::= EntityRef | CharRef  [68] EntityRef ::= '&' Name ';'  [ WFC: Entity Declared ] the Name given in the entity reference must match that in an entity declaration, except that well-formed documents need not declare any of the following entities: amp, lt, gt, apos, quot.  [ WFC: Parsed Entity ] An entity reference must not contain the name of an unparsed entity  [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'  A PEReference may have been detected in the current input stream the handling is done accordingly to http://www.w3.org/TR/REC-xml#entproc
       
       
@@ -11383,14 +11424,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_PATTERN_ENABLED
+      defined(LIBXML_PATTERN_ENABLED)
       Test wether the node matches the pattern
       
       
       
     
     
-      LIBXML_PATTERN_ENABLED
+      defined(LIBXML_PATTERN_ENABLED)
       Compile a pattern.
       
       
@@ -11477,7 +11518,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption.
       
       
@@ -11486,7 +11527,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Create an xmltextReader for an XML from a file descriptor. The parsing flags @options are a combination of xmlParserOption. NOTE that the file descriptor will not be closed when the reader is closed or reset.
       
       
@@ -11495,7 +11536,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption.
       
       
@@ -11503,7 +11544,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Create an xmltextReader for an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption.
       
       
@@ -11514,7 +11555,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption.
       
       
@@ -11524,7 +11565,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
       
       
@@ -11534,7 +11575,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Setup an xmltextReader to parse an XML from a file descriptor. NOTE that the file descriptor will not be closed when the reader is closed or reset. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
       
       
@@ -11544,7 +11585,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
       
       
@@ -11553,7 +11594,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Setup an xmltextReader to parse an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
       
       
@@ -11565,7 +11606,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
       
       
@@ -11576,14 +11617,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Setup an xmltextReader to parse a preparsed XML document. This reuses the existing @reader xmlTextReader.
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Create an xmltextReader for a preparsed document.
       
       
@@ -11603,29 +11644,33 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_TREE_ENABLED)
       This function checks that all the namespaces declared within the given tree are properly declared. This is needed for example after Copy or Cut and then paste operations. The subtree may still hold pointers to namespace declarations outside the subtree or invalid/masked. As much as possible the function try to reuse the existing namespaces found in the new environment. If not possible the new namespaces are redeclared on @tree at the top of the given subtree.
       
       
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML in-memory document and build a tree. In the case the document is not Well Formed, a tree is built anyway
       
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. In the case the document is not Well Formed, a tree is built anyway
       
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML in-memory block and build a tree. In the case the document is not Well Formed, a tree is built anyway
       
       
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       
       
       
@@ -11634,7 +11679,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       Push one input token in the execution context
       
       
@@ -11642,7 +11687,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       Push one input token in the execution context
       
       
@@ -11651,19 +11696,19 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       Free the structures associated to a regular expression evaulation context.
       
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       Free a regexp
       
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       Build a context used for progressive evaluation of a regexp.
       
       
@@ -11671,26 +11716,26 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       Parses a regular expression conforming to XML Schemas Part 2 Datatype Appendix F and builds an automata suitable for testing strings against that regular expression
       
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       Check if the regular expression generates the value
       
       
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       Check if the regular expression is determinist
       
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_REGEXP_ENABLED)
       Print the content of the compiled regular expression
       
       
@@ -11706,12 +11751,12 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Registers the default compiled-in I/O handlers.
       
     
     
-      LIBXML_HTTP_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED) && defined(LIBXML_HTTP_ENABLED)
       By default, libxml submits HTTP output requests using the "PUT" method. Calling this method changes the HTTP output method to use the "POST" method instead.
       
     
@@ -11734,7 +11779,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Register a new set of I/O callback for handling output.
       
       
@@ -11743,46 +11788,44 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Cleanup the default Schemas type library associated to RelaxNG
       
     
     
-      LIBXML_SCHEMAS_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump a RelaxNG structure back
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump the transformed RelaxNG tree.
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Deallocate a RelaxNG structure.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Free the resources associated to the schema parser context
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Free the resources associated to the schema validation context
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Get the callback information used to handle errors for a validation context
       
       
@@ -11791,7 +11834,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Get the error and warning callback informations
       
       
@@ -11800,43 +11843,43 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Initilize the default type libraries.
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Create an XML RelaxNGs parser context for that document. Note: since the process of compiling a RelaxNG schemas modifies the document, the @doc parameter is duplicated internally.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Create an XML RelaxNGs parse context for that memory buffer expected to contain an XML RelaxNGs file.
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Create an XML RelaxNGs parse context for that file/resource expected to contain an XML RelaxNGs file.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Create an XML RelaxNGs validation context based on the given schema
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       parse a schema definition resource and build an internal XML Shema struture which can be used to validate instances. *WARNING* this interface is highly subject to change
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Set the callback functions used to handle errors for a validation context
       
       
@@ -11845,7 +11888,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Set the error and warning callback informations
       
       
@@ -11854,14 +11897,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Validate a document tree in memory.
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Validate a full subtree when xmlRelaxNGValidatePushElement() returned 0 and the content of the node has been expanded.
       
       
@@ -11869,7 +11912,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Pop the element end from the RelaxNG validation stack.
       
       
@@ -11877,7 +11920,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       check the CData parsed for validation in the current stack
       
       
@@ -11885,7 +11928,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Push a new element start on the RelaxNG validation stack.
       
       
@@ -11893,7 +11936,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       
       
       
@@ -11901,7 +11944,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       
       
       
@@ -11909,7 +11952,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Semi private function used to pass informations to a parser context which are a combination of xmlRelaxNGParserFlag .
       
       
@@ -11922,7 +11965,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED)
       Unlink and free one attribute, all the content is freed too Note this doesn't work for namespace definition attributes
       
       
@@ -11934,7 +11977,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
       Unlink the old node from its current context, prune the new one at the same place. If @cur was already inserted in a document it is first unlinked from its existing context.
       
       
@@ -11994,6 +12037,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)
       called when the end of an element has been detected.
       
       
@@ -12081,13 +12125,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DOCB_ENABLED
+      defined(LIBXML_DOCB_ENABLED)
       Initialize the default DocBook SAX2 handler
       
       
     
     
-      LIBXML_HTML_ENABLED
+      defined(LIBXML_HTML_ENABLED)
       Initialize the default HTML SAX2 handler
       
       
@@ -12145,6 +12189,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)
       called when an opening tag has been processed.
       
       
@@ -12174,11 +12219,13 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       Set the default version of SAX used globally by the library. By default, during initialization the default is set to 2. Note that it is generally a better coding style to use xmlSAXVersion() to set up the version explicitly for a given parsing context.
       
       
     
     
+      defined(LIBXML_VALID_ENABLED)
       Load and parse an external subset.
       
       
@@ -12186,6 +12233,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML in-memory document and build a tree. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.
       
       
@@ -12193,12 +12241,14 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML external entity out of context and build a tree. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.  [78] extParsedEnt ::= TextDecl? content  This correspond to a "Well Balanced" chunk
       
       
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.
       
       
@@ -12206,6 +12256,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.  User data (void *) is stored within the parser context in the context's _private member, so it is available nearly everywhere in libxml
       
       
@@ -12214,6 +12265,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML in-memory block and use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.
       
       
@@ -12222,6 +12274,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML in-memory block and use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.  User data (void *) is stored within the parser context in the context's _private member, so it is available nearly everywhere in libxml
       
       
@@ -12231,6 +12284,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       parse an XML file and call the given SAX handler routines. Automatic support for ZLIB/Compress compressed document is provided
       
       
@@ -12238,6 +12292,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       A better SAX parsing routine. parse an XML in-memory buffer and call the given SAX handler routines.
       
       
@@ -12252,27 +12307,27 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Close a document saving context, i.e. make sure that all bytes have been output and free the associated data.
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Save a full document to a saving context TODO: The function is not fully implemented yet as it does not return the byte count but 0 instead
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document to a file. Will use compression if compiled in and enabled. If @filename is "-" the stdout file is used.
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document, converting it to the given encoding
       
       
@@ -12280,7 +12335,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document to an I/O buffer. Warning ! This call xmlOutputBufferClose() on buf which is not available after this call.
       
       
@@ -12288,13 +12343,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Flush a document saving context, i.e. make sure that all bytes have been output.
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document to a file. Will use compression if compiled in and enabled. If @filename is "-" the stdout file is used. If @format is set then the document will be indented on output. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called
       
       
@@ -12302,7 +12357,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document to a file or an URL.
       
       
@@ -12311,7 +12366,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Dump an XML document to an I/O buffer. Warning ! This call xmlOutputBufferClose() on buf which is not available after this call.
       
       
@@ -12320,21 +12375,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Set a custom escaping function to be used for text in attribute content
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Set a custom escaping function to be used for text in element content
       
       
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Create a document saving context serializing to a file descriptor with the encoding and the options given.
       
       
@@ -12342,7 +12397,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Create a document saving context serializing to a filename or possibly to an URL (but this is less reliable) with the encoding and the options given.
       
       
@@ -12350,7 +12405,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Create a document saving context serializing to a file descriptor with the encoding and the options given
       
       
@@ -12360,7 +12415,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_OUTPUT_ENABLED)
       Save a subtree starting at the node parameter to a saving context TODO: The function is not fully implemented yet as it does not return the byte count but 0 instead
       
       
@@ -12372,12 +12427,13 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Trickery: parse an XML name but without consuming the input flow Needed for rollback cases. Used only when parsing entities references.  TODO: seems deprecated now, only used in the default part of xmlParserHandleReference  [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender  [5] Name ::= (Letter | '_' | ':') (NameChar)*  [6] Names ::= Name (S Name)*
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Checks the default values types, especially for facets
       
       
@@ -12386,93 +12442,92 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Cleanup the default XML Schemas type library
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Removes and normalize white spaces in the string
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Compare 2 values
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump a Schema structure.
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Deallocate a Schema structure.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Deallocate a Schema Facet structure.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Free the resources associated to the schema parser context
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Deallocate a Schema Type structure.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Free the resources associated to the schema validation context
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Cleanup the default XML Schemas type library
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Deallocates a wildcard structure.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Lookup function
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Gives you the type struct for a built-in type by its type id.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Extract the value of a facet
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Get the callback information used to handle errors for a parser context
       
       
@@ -12481,14 +12536,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Lookup a type in the default XML Schemas type library
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Get the error and warning callback informations
       
       
@@ -12497,55 +12552,55 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Initialize the default XML Schemas type library
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Evaluates if a specific facet can be used in conjunction with a type.
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Create an XML Schemas parse context for that document. NB. The document may be modified during the parsing process.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Allocate a new Facet structure.
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Create an XML Schemas parse context for that memory buffer expected to contain an XML Schemas file.
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Create an XML Schemas parse context for that file/resource expected to contain an XML Schemas file.
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Create an XML Schemas validation context based on the given schema
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       parse a schema definition resource and build an internal XML Shema struture which can be used to validate instances. *WARNING* this interface is highly subject to change
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Set the callback functions used to handle errors for a validation context
       
       
@@ -12554,7 +12609,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Set the error and warning callback informations
       
       
@@ -12563,14 +12618,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Sets the options to be used during the validation.
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Check that a value conforms to the lexical space of the predefined type. if true a value is computed and returned in @val.
       
       
@@ -12579,7 +12634,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Check that a value conforms to the lexical space of the predefined type. if true a value is computed and returned in @val. This one does apply any normalization to the value.
       
       
@@ -12588,20 +12643,20 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
-      
-      
+      defined(LIBXML_SCHEMAS_ENABLED)
+      Get the validation context options.
+      
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Validate a document tree in memory.
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Check a value against a facet condition
       
       
@@ -12610,7 +12665,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Checka a value against a "length", "minLength" and "maxLength" facet; sets @length to the computed length of @value.
       
       
@@ -12620,7 +12675,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Checks the value of a list simple type against a facet.
       
       
@@ -12629,14 +12684,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Validate a branch of a tree, starting with the given @elem.
       
       
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Check that a value conforms to the lexical space of the predefined type. if true a value is computed and returned in @val.
       
       
@@ -12644,7 +12699,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Validate a document tree in memory.
       
       
@@ -12654,7 +12709,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       
       
       
@@ -12662,7 +12717,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       
       
       
@@ -12670,7 +12725,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_SCHEMAS_ENABLED)
       Replaces 0xd, 0x9 and 0xa with a space.
       
       
@@ -12706,6 +12761,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Set the function to call call back when a xml reference has been made
       
       
@@ -12716,6 +12772,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_LEGACY_ENABLED)
       Change the current value of one feature of this parser instance
       
       
@@ -12741,7 +12798,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED)
       Set (or reset) an attribute carried by a node. The ns structure must be in scope, this is not checked.
       
       
@@ -12750,7 +12807,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED)
       Set (or reset) an attribute carried by a node.
       
       
@@ -12770,6 +12827,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_SAX1_ENABLED)
       Setup the parser context to parse a new buffer; Clears any prior contents from the parser context. The buffer parameter must not be NULL, but the filename parameter can be
       
       
@@ -12777,8 +12835,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       Implements the XML shell This allow to load, validate, view, modify and save a document using a environment similar to a UNIX commandline.
       
       
@@ -12787,8 +12844,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       Implements the XML shell function "base" dumps the current XML base of the node
       
       
@@ -12797,8 +12853,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Implements the XML shell function "cat" dumps the serialization node content (XML or HTML).
       
       
@@ -12807,8 +12862,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       This is a generic signature for the XML shell functions.
       
       
@@ -12817,8 +12871,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       Implements the XML shell function "dir" dumps informations about the node (namespace, attributes, content).
       
       
@@ -12827,8 +12880,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       Implements the XML shell function "du" show the structure of the subtree under node @tree If @tree is null, the command works on the current node.
       
       
@@ -12837,8 +12889,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       Implements the XML shell function "ls" Does an Unix like listing of the given node (like a directory)
       
       
@@ -12847,8 +12898,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       Implements the XML shell function "load" loads a new document specified by the filename
       
       
@@ -12857,30 +12907,26 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Print node to the output FILE
       
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       Print the xpath error to libxml default error channel
       
       
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       Prints result to the output FILE
       
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       Implements the XML shell function "pwd" Show the full path from the root to the node, if needed building thumblers when similar elements exists at a given ancestor level. The output is compatible with XPath commands.
       
       
@@ -12889,16 +12935,13 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
       This is a generic signature for the XML shell input function.
       
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Implements the XML shell function "save" Write the current document to the filename, or it's original name
       
       
@@ -12907,8 +12950,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_VALID_ENABLED)
       Implements the XML shell function "validate" Validate the document, if a DTD path is provided, then the validation is done against the given DTD.
       
       
@@ -12917,9 +12959,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_DEBUG_ENABLED
-      LIBXML_XPATH_ENABLED
-      LIBXML_OUTPUT_ENABLED
+      defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Implements the XML shell function "write" Write the current node to the filename, it saves the serialization of the subtree under the @node specified
       
       
@@ -12960,6 +13000,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_OUTPUT_ENABLED)
       Deprecated, unsafe, use xmlSnprintfElementContent
       
       
@@ -12967,6 +13008,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_PUSH_ENABLED)
       Blocks further parser processing
       
       
@@ -13177,104 +13219,104 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Provides the number of attributes of the current node
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The base URI of the node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       This method releases any resources allocated by the current instance changes the state to Closed and close any underlying input.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The base URI of the node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Determine the encoding of the document being read.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The local name of the node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The qualified name of the node, equal to Prefix :LocalName.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The URI defining the namespace associated with the node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       A shorthand reference to the namespace associated with the node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Get an interned string from the reader, allows for example to speedup string name comparisons
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Provides the text value of the node if present
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The xml:lang scope within which the node resides.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Determine the XML version of the document being read.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Hacking interface allowing to get the xmlDocPtr correponding to the current document being accessed by the xmlTextReader. NOTE: as a result of this call, the reader will not destroy the associated XML document and calling xmlFreeDoc() on the result is needed once the reader parsing has finished.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Hacking interface allowing to get the xmlNodePtr correponding to the current node being accessed by the xmlTextReader. This is dangerous because the underlying node may be destroyed on the next Reads.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The depth of the node in the tree.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       
       
       
@@ -13283,27 +13325,27 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Reads the contents of the current node and the full subtree. It then makes the subtree available until the next xmlTextReaderRead() call
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Provides the value of the attribute with the specified qualified name.
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Provides the value of the attribute with the specified index relative to the containing element.
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Provides the value of the specified attribute
       
       
@@ -13311,7 +13353,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Retrieve the error callback function and user argument.
       
       
@@ -13319,95 +13361,95 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Read the parser internal property.
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Method to get the remainder of the buffered XML. this method stops the parser, set its state to End Of File and return the input stream with what is left that the parser did not use.  The implementation is not good, the parser certainly procgressed past what's left in reader->input, and there is an allocation problem. Best would be to rewrite it differently.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Whether the node has attributes.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Whether the node can have a text value.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Whether an Attribute  node was generated from the default value defined in the DTD or schema.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Check if the current node is empty
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Determine whether the current node is a namespace declaration rather than a regular attribute.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Retrieve the validity status from the parser context
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The local name of the node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Obtain the base URI for the given locator.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Obtain the line number for the given locator.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Resolves a namespace prefix in the scope of the current element.
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Moves the position of the current instance to the attribute with the specified qualified name.
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Moves the position of the current instance to the attribute with the specified index relative to the containing element.
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Moves the position of the current instance to the attribute with the specified local name and namespace URI.
       
       
@@ -13415,73 +13457,73 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Moves the position of the current instance to the node that contains the current Attribute  node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Moves the position of the current instance to the first attribute associated with the current node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Moves the position of the current instance to the next attribute associated with the current node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The qualified name of the node, equal to Prefix :LocalName.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The URI defining the namespace associated with the node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Skip to the node following the current one in document order while avoiding the subtree if any.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Skip to the node following the current one in document order while avoiding the subtree if any. Currently implemented only for Readers built on a document
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Get the node type of the current node Reference: http://dotgnu.org/pnetlib-doc/System/Xml/XmlNodeType.html
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The value indicating whether to normalize white space and attribute values. Since attribute value and end of line normalizations are a MUST in the XML specification only the value true is accepted. The broken bahaviour of accepting out of range character entities like &#0; is of course not supported either.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       A shorthand reference to the namespace associated with the node.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       This tells the XML Reader to preserve the current node. The caller must also use xmlTextReaderCurrentDoc() to keep an handle on the resulting document once parsing has finished
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED) && defined(LIBXML_PATTERN_ENABLED)
       This tells the XML Reader to preserve all nodes matched by the pattern. The caller must also use xmlTextReaderCurrentDoc() to keep an handle on the resulting document once parsing has finished
       
       
@@ -13489,65 +13531,63 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The quotation mark character used to enclose the value of an attribute.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Moves the position of the current instance to the next node in the stream, exposing its properties.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Parses an attribute value into one or more Text and EntityReference nodes.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Reads the contents of the current node, including child nodes and markup.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Reads the contents of the current node, including child nodes and markup.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Gets the read state of the reader.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Reads the contents of an element or a text node as a string.
       
       
     
     
-      LIBXML_READER_ENABLED
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_READER_ENABLED) && defined(LIBXML_SCHEMAS_ENABLED)
       Use RelaxNG to validate the document as it is processed. Activation is only possible before the first Read(). if @schema is NULL, then RelaxNG validation is desactivated. @ The @schema should not be freed until the reader is deallocated or its use has been deactivated.
       
       
       
     
     
-      LIBXML_READER_ENABLED
-      LIBXML_SCHEMAS_ENABLED
+      defined(LIBXML_READER_ENABLED) && defined(LIBXML_SCHEMAS_ENABLED)
       Use RelaxNG to validate the document as it is processed. Activation is only possible before the first Read(). if @rng is NULL, then RelaxNG validation is desactivated.
       
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Register a callback function that will be called on error and warnings.  If @f is NULL, the default error and warning handlers are restored.
       
       
@@ -13555,7 +13595,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Change the parser processing behaviour by changing some of its internal properties. Note that some properties can only be changed before any read has been done.
       
       
@@ -13563,7 +13603,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Register a callback function that will be called on error and warnings.  If @f is NULL, the default error and warning handlers are restored.
       
       
@@ -13571,118 +13611,118 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Determine the standalone status of the document being read.
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       Provides the text value of the node if present
       
       
     
     
-      LIBXML_READER_ENABLED
+      defined(LIBXML_READER_ENABLED)
       The xml:lang scope within which the node resides.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End the current xml element.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End an xml CDATA section.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End the current xml coment.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End an xml DTD.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End an xml DTD attribute list.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End an xml DTD element.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End an xml DTD entity.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End an xml document. All open elements are closed
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End the current xml element.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End the current xml PI.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Flush the output buffer.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       End the current xml element. Writes an end tag even if the element is empty
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Set indentation output. indent = 0 do not indentation. indent > 0 do indentation.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Set string indentation.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml attribute.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml attribute with namespace support.
       
       
@@ -13691,19 +13731,19 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml CDATA section.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml comment.
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml DTD.
       
       
@@ -13712,21 +13752,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml DTD ATTLIST.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml DTD element.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml DTD ATTLIST.
       
       
@@ -13734,7 +13774,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start a new xml document
       
       
@@ -13743,14 +13783,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml element.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml element with namespace support.
       
       
@@ -13759,14 +13799,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Start an xml PI.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml attribute.
       
       
@@ -13774,7 +13814,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml attribute.
       
       
@@ -13784,7 +13824,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an base64 encoded xml text.
       
       
@@ -13793,7 +13833,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a BinHex encoded xml text.
       
       
@@ -13802,21 +13842,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml CDATA.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml comment.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a DTD.
       
       
@@ -13826,7 +13866,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a DTD ATTLIST.
       
       
@@ -13834,7 +13874,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a DTD element.
       
       
@@ -13842,7 +13882,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a DTD entity.
       
       
@@ -13854,7 +13894,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a DTD external entity. The entity must have been started with xmlTextWriterStartDTDEntity
       
       
@@ -13865,7 +13905,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write the contents of a DTD external entity.
       
       
@@ -13874,7 +13914,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a DTD internal entity.
       
       
@@ -13883,7 +13923,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a DTD entity.
       
       
@@ -13892,7 +13932,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml element.
       
       
@@ -13900,7 +13940,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml element with namespace support.
       
       
@@ -13910,7 +13950,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml attribute.
       
       
@@ -13919,7 +13959,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml attribute.with namespace support
       
       
@@ -13930,7 +13970,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml CDATA.
       
       
@@ -13938,7 +13978,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml comment.
       
       
@@ -13946,7 +13986,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a DTD with a formatted markup declarations part.
       
       
@@ -13957,7 +13997,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted DTD ATTLIST.
       
       
@@ -13966,7 +14006,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted DTD element.
       
       
@@ -13975,7 +14015,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted DTD internal entity.
       
       
@@ -13985,7 +14025,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml element.
       
       
@@ -13994,7 +14034,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml element with namespace support.
       
       
@@ -14005,7 +14045,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted PI.
       
       
@@ -14014,7 +14054,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted raw xml text.
       
       
@@ -14022,7 +14062,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml text.
       
       
@@ -14030,7 +14070,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml PI.
       
       
@@ -14038,14 +14078,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a raw xml text.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml text. TODO: what about entities and special chars??
       
       
@@ -14053,14 +14093,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml text.
       
       
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml attribute.
       
       
@@ -14069,7 +14109,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml attribute.with namespace support
       
       
@@ -14080,7 +14120,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml CDATA.
       
       
@@ -14088,7 +14128,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write an xml comment.
       
       
@@ -14096,7 +14136,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a DTD with a formatted markup declarations part.
       
       
@@ -14107,7 +14147,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted DTD ATTLIST.
       
       
@@ -14116,7 +14156,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted DTD element.
       
       
@@ -14125,7 +14165,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted DTD internal entity.
       
       
@@ -14135,7 +14175,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml element.
       
       
@@ -14144,7 +14184,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml element with namespace support.
       
       
@@ -14155,7 +14195,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml PI.
       
       
@@ -14164,7 +14204,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted raw xml text.
       
       
@@ -14172,7 +14212,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_WRITER_ENABLED
+      defined(LIBXML_WRITER_ENABLED)
       Write a formatted xml text.
       
       
@@ -14277,999 +14317,999 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of AegeanNumbers UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of AlphabeticPresentationForms UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Arabic UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of ArabicPresentationForms-A UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of ArabicPresentationForms-B UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Armenian UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Arrows UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of BasicLatin UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Bengali UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of the UCS Block
       
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of BlockElements UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Bopomofo UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of BopomofoExtended UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of BoxDrawing UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of BraillePatterns UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Buhid UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of ByzantineMusicalSymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CJKCompatibility UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CJKCompatibilityForms UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CJKCompatibilityIdeographs UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CJKCompatibilityIdeographsSupplement UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CJKRadicalsSupplement UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CJKSymbolsandPunctuation UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CJKUnifiedIdeographs UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CJKUnifiedIdeographsExtensionA UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CJKUnifiedIdeographsExtensionB UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of the UCS Category
       
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of C UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Cc UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Cf UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Co UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Cs UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of L UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Ll UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Lm UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Lo UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Lt UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Lu UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of M UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Mc UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Me UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Mn UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of N UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Nd UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Nl UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of No UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of P UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Pc UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Pd UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Pe UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Pf UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Pi UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Po UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Ps UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of S UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Sc UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Sk UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Sm UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of So UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Z UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Zl UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Zp UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Zs UCS Category
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Cherokee UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CombiningDiacriticalMarks UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CombiningDiacriticalMarksforSymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CombiningHalfMarks UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CombiningMarksforSymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of ControlPictures UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CurrencySymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CypriotSyllabary UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Cyrillic UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of CyrillicSupplement UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Deseret UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Devanagari UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Dingbats UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of EnclosedAlphanumerics UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of EnclosedCJKLettersandMonths UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Ethiopic UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of GeneralPunctuation UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of GeometricShapes UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Georgian UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Gothic UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Greek UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of GreekExtended UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of GreekandCoptic UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Gujarati UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Gurmukhi UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of HalfwidthandFullwidthForms UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of HangulCompatibilityJamo UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of HangulJamo UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of HangulSyllables UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Hanunoo UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Hebrew UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of HighPrivateUseSurrogates UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of HighSurrogates UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Hiragana UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of IPAExtensions UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of IdeographicDescriptionCharacters UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Kanbun UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of KangxiRadicals UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Kannada UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Katakana UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of KatakanaPhoneticExtensions UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Khmer UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of KhmerSymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Lao UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Latin-1Supplement UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of LatinExtended-A UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of LatinExtendedAdditional UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of LatinExtended-B UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of LetterlikeSymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Limbu UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of LinearBIdeograms UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of LinearBSyllabary UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of LowSurrogates UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Malayalam UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of MathematicalAlphanumericSymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of MathematicalOperators UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of MiscellaneousMathematicalSymbols-A UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of MiscellaneousMathematicalSymbols-B UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of MiscellaneousSymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of MiscellaneousSymbolsandArrows UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of MiscellaneousTechnical UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Mongolian UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of MusicalSymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Myanmar UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of NumberForms UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Ogham UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of OldItalic UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of OpticalCharacterRecognition UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Oriya UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Osmanya UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of PhoneticExtensions UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of PrivateUse UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of PrivateUseArea UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Runic UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Shavian UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Sinhala UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of SmallFormVariants UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of SpacingModifierLetters UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Specials UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of SuperscriptsandSubscripts UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of SupplementalArrows-A UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of SupplementalArrows-B UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of SupplementalMathematicalOperators UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of SupplementaryPrivateUseArea-A UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of SupplementaryPrivateUseArea-B UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Syriac UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Tagalog UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Tagbanwa UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Tags UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of TaiLe UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of TaiXuanJingSymbols UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Tamil UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Telugu UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Thaana UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Thai UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Tibetan UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of Ugaritic UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of UnifiedCanadianAboriginalSyllabics UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of VariationSelectors UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of VariationSelectorsSupplement UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of YiRadicals UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of YiSyllables UCS Block
       
       
     
     
-      LIBXML_UNICODE_ENABLED
+      defined(LIBXML_UNICODE_ENABLED)
       Check whether the character is part of YijingHexagramSymbols UCS Block
       
       
@@ -15349,7 +15389,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Remove an attribute carried by a node.
       
       
@@ -15357,21 +15397,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_TREE_ENABLED
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Remove an attribute carried by a node.
       
       
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
       (Re)Build the automata associated to the content model of this element
       
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Does the validation related extra step of the normalization of attribute values:  If the declared value is not CDATA, then the XML processor must further process the normalized attribute value by discarding any leading and trailing space (#x20) characters, and by replacing sequences of space (#x20) characters by single space (#x20) character.  Also  check VC: Standalone Document Declaration in P32, and update ctxt->valid accordingly
       
       
@@ -15381,6 +15421,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_VALID_ENABLED)
       Build/extend a list of  potential children allowed by the content tree
       
       
@@ -15389,6 +15430,7 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_VALID_ENABLED)
       This function returns the list of authorized children to insert within an existing tree while respecting the validity constraints forced by the Dtd. The insertion point is defined using @prev and @next in the following ways: to insert before 'node': xmlValidGetValidElements(node->prev, node, ... to insert next 'node': xmlValidGetValidElements(node, node->next, ... to replace 'node': xmlValidGetValidElements(node->prev, node->next, ... to prepend a child to 'node': xmlValidGetValidElements(NULL, node->childs, to append a child to 'node': xmlValidGetValidElements(node->last, NULL, ...  pointers to the element names are inserted at the beginning of the array and do not need to be freed.
       
       
@@ -15397,7 +15439,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Does the validation related extra step of the normalization of attribute values:  If the declared value is not CDATA, then the XML processor must further process the normalized attribute value by discarding any leading and trailing space (#x20) characters, and by replacing sequences of space (#x20) characters by single space (#x20) character.
       
       
@@ -15406,7 +15448,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate a single attribute definition basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Attribute Default Legal ] - [ VC: Enumeration ] - [ VC: ID Attribute Default ]  The ID/IDREF uniqueness and matching are done separately
       
       
@@ -15414,28 +15456,28 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Validate that the given attribute value match  the proper production  [ VC: ID ] Values of type ID must match the Name production....  [ VC: IDREF ] Values of type IDREF must match the Name production, and values of type IDREFS must match Names ...  [ VC: Entity Name ] Values of type ENTITY must match the Name production, values of type ENTITIES must match Names ...  [ VC: Name Token ] Values of type NMTOKEN must match the Nmtoken production; values of type NMTOKENS must match Nmtokens.
       
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate the document instance  basically it does the all the checks described by the XML Rec i.e. validates the internal and external subset (if present) and validate the document tree.
       
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Does the final step for the document validation once all the incremental validation steps have been completed  basically it does the following checks described by the XML Rec  Check all the IDREF/IDREFS attributes definition for validity
       
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate the document against the dtd instance  Basically it does check all the definitions in the DtD. Note the the internal subset (if present) is de-coupled (i.e. not used), which could give problems if ID or IDREF is present.
       
       
@@ -15443,14 +15485,14 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Does the final step for the dtds validation once all the subsets have been parsed  basically it does the following checks described by the XML Rec - check that ENTITY and ENTITIES type attributes default or possible values matches one of the defined entities. - check that NOTATION type attributes default or possible values matches one of the defined notations.
       
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate the subtree under an element
       
       
@@ -15458,7 +15500,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate a single element definition basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: One ID per Element Type ] - [ VC: No Duplicate Types ] - [ VC: Unique Element Type Declaration ]
       
       
@@ -15466,49 +15508,52 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
       Check that a value conforms to the lexical space of NCName
       
       
       
     
     
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Check that a value conforms to the lexical space of NMToken
       
       
       
     
     
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Check that a value conforms to the lexical space of Name
       
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Validate that the given value match Name production
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Validate that the given value match Names production
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Validate that the given value match Nmtoken production  [ VC: Name Token ]
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Validate that the given value match Nmtokens production  [ VC: Name Token ]
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate a single notation definition basically it does the following checks as described by the XML-1.0 recommendation: - it seems that no validity constraint exists on notation declarations But this function get called anyway ...
       
       
@@ -15516,7 +15561,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Validate that the given name match a notation declaration. - [ VC: Notation Declared ]
       
       
@@ -15524,7 +15569,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate a single attribute for an element basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Attribute Value Type ] - [ VC: Fixed Attribute Default ] - [ VC: Entity Name ] - [ VC: Name Token ] - [ VC: ID ] - [ VC: IDREF ] - [ VC: Entity Name ] - [ VC: Notation Attributes ]  The ID/IDREF uniqueness and matching are done separately
       
       
@@ -15534,7 +15579,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate a single element and it's attributes, basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Element Valid ] - [ VC: Required Attribute ] Then call xmlValidateOneAttribute() for each attribute present.  The ID/IDREF checkings are done separately
       
       
@@ -15542,7 +15587,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate a single namespace declaration for an element basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Attribute Value Type ] - [ VC: Fixed Attribute Default ] - [ VC: Entity Name ] - [ VC: Name Token ] - [ VC: ID ] - [ VC: IDREF ] - [ VC: Entity Name ] - [ VC: Notation Attributes ]  The ID/IDREF uniqueness and matching are done separately
       
       
@@ -15553,7 +15598,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
       Pop the element end from the validation stack.
       
       
@@ -15562,7 +15607,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
       check the CData parsed for validation in the current stack
       
       
@@ -15570,7 +15615,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_REGEXP_ENABLED
+      defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
       Push a new element start on the validation stack.
       
       
@@ -15579,13 +15624,14 @@ actually an xmlCharEncoding'/>
       
     
     
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Check that a value conforms to the lexical space of QName
       
       
       
     
     
-      LIBXML_VALID_ENABLED
+      defined(LIBXML_VALID_ENABLED)
       Try to validate a the root element basically it does the following check as described by the XML-1.0 recommendation: - [ VC: Root Element Type ] it doesn't try to recurse or apply other check to the element
       
       
@@ -15606,177 +15652,177 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XINCLUDE_ENABLED
+      defined(LIBXML_XINCLUDE_ENABLED)
       Free an XInclude context
       
       
     
     
-      LIBXML_XINCLUDE_ENABLED
+      defined(LIBXML_XINCLUDE_ENABLED)
       Creates a new XInclude context
       
       
     
     
-      LIBXML_XINCLUDE_ENABLED
+      defined(LIBXML_XINCLUDE_ENABLED)
       Implement the XInclude substitution on the XML document @doc
       
       
     
     
-      LIBXML_XINCLUDE_ENABLED
+      defined(LIBXML_XINCLUDE_ENABLED)
       Implement the XInclude substitution on the XML document @doc
       
       
       
     
     
-      LIBXML_XINCLUDE_ENABLED
+      defined(LIBXML_XINCLUDE_ENABLED)
       Implement the XInclude substitution for the given subtree reusing the informations and data coming from the given context.
       
       
       
     
     
-      LIBXML_XINCLUDE_ENABLED
+      defined(LIBXML_XINCLUDE_ENABLED)
       Implement the XInclude substitution for the given subtree
       
       
     
     
-      LIBXML_XINCLUDE_ENABLED
+      defined(LIBXML_XINCLUDE_ENABLED)
       Implement the XInclude substitution for the given subtree
       
       
       
     
     
-      LIBXML_XINCLUDE_ENABLED
+      defined(LIBXML_XINCLUDE_ENABLED)
       Set the flags used for further processing of XML resources.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the add operation on XPath objects: The numeric operators convert their operands to numbers as if by calling the number function.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       An axis traversal function. To traverse an axis, the engine calls the first time with cur == NULL and repeat until the function returns NULL indicating the end of the axis traversal.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the boolean() XPath function boolean boolean(object) The boolean function converts its argument to a boolean as follows: - a number is true if and only if it is neither positive or negative zero nor NaN - a node-set is true if and only if it is non-empty - a string is true if and only if its length is non-zero
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a boolean to its number value
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a boolean to its string value.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a node-set to its boolean value
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a node-set to its number value
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a node-set to its string value.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a node to its number value
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a node to its string value.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a number to its boolean value
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a number to its string value.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a string to its boolean value
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts a string to its number value
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts an XPath object to its boolean value
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts an XPath object to its number value
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts an existing object to its string() equivalent
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the ceiling() XPath function number ceiling(number) The ceiling function returns the smallest (closest to negative infinity) number that is not less than the argument and that is an integer.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Compare two nodes w.r.t document order
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the compare operation on XPath objects: @arg1 < @arg2    (1, 1, ... @arg1 <= @arg2   (1, 0, ... @arg1 > @arg2    (0, 1, ... @arg1 >= @arg2   (0, 0, ...  When neither object to be compared is a node-set and the operator is <=, <, >=, >, then the objects are compared by converted both objects to numbers and comparing the numbers according to IEEE 754. The < comparison will be true if and only if the first number is less than the second number. The <= comparison will be true if and only if the first number is less than or equal to the second number. The > comparison will be true if and only if the first number is greater than the second number. The >= comparison will be true if and only if the first number is greater than or equal to the second number.
       
       
@@ -15784,74 +15830,73 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Compile an XPath expression
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Evaluate the Precompiled XPath expression in the given context.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the concat() XPath function string concat(string, string, string*) The concat function returns the concatenation of its arguments.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the contains() XPath function boolean contains(string, string) The contains function returns true if the first argument string contains the second argument string, and otherwise returns false.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts an existing object to its boolean() equivalent
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       A conversion function is associated to a type and used to cast the new type to primitive values.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts an existing object to its number() equivalent
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Converts an existing object to its string() equivalent
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the count() XPath function number count(node-set)
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Compile an XPath expression
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_DEBUG_ENABLED)
       Dumps the tree of the compiled XPath expression.
       
       
@@ -15859,8 +15904,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
-      LIBXML_DEBUG_ENABLED
+      defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_DEBUG_ENABLED)
       Dump the content of the object for debugging purposes
       
       
@@ -15868,136 +15912,136 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets difference() function: node-set set:difference (node-set, node-set)
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets distinct() function: node-set set:distinct (node-set) @nodes is sorted by document order, then #exslSetsDistinctSorted is called with the sorted node-set
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets distinct() function: node-set set:distinct (node-set)
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the div operation on XPath objects @arg1 / @arg2: The numeric operators convert their operands to numbers as if by calling the number function.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the equal operation on XPath objects content: @arg1 == @arg2
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Handle a Relax NG Parsing error
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Evaluate the XPath Location Path in the given context.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Parse and evaluate an XPath expression in the given context, then push the result on the context stack
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Evaluate the XPath expression in the given context.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       An XPath evaluation function, the parameters are on the XPath context stack.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Evaluate a predicate result for the current node. A PredicateExpr is evaluated by evaluating the Expr and converting the result to a boolean. If the result is a number, the result will be converted to true if the number is equal to the position of the context node in the context node list (as returned by the position function) and will be converted to false otherwise; if the result is not a number, then the result will be converted as if by a call to the boolean function.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Evaluate a predicate result for the current node. A PredicateExpr is evaluated by evaluating the Expr and converting the result to a boolean. If the result is a number, the result will be converted to true if the number is equal to the position of the context node in the context node list (as returned by the position function) and will be converted to false otherwise; if the result is not a number, then the result will be converted as if by a call to the boolean function.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the false() XPath function boolean false()
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the floor() XPath function number floor(number) The floor function returns the largest (closest to positive infinity) number that is not greater than the argument and that is an integer.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Free up the memory allocated by @comp
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Free up an xmlXPathContext
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Free the NodeSet compound (not the actual nodes !).
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Free up the xmlXPathObjectPtr @obj but don't deallocate the objects in the list contrary to xmlXPathFreeObject().
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Free up an xmlXPathObjectPtr object.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Free up an xmlXPathParserContext
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Prototype for callbacks used to plug function lookup in the XPath engine.
       
       
@@ -16005,21 +16049,21 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       An XPath function. The arguments (if any) are popped out from the context stack and the result is pushed on the stack.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Search in the Function array of the context for the given function.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Search in the Function array of the context for the given function.
       
       
@@ -16027,272 +16071,272 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets has-same-nodes function: boolean set:has-same-node(node-set, node-set)
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the id() XPath function node-set id(object) The id function selects elements by their unique ID (see [5.2.1 Unique IDs]). When the argument to id is of type node-set, then the result is the union of the result of applying id to the string value of each of the nodes in the argument node-set. When the argument to id is of any other type, the argument is converted to a string as if by a call to the string function; the string is split into a whitespace-separated list of tokens (whitespace is any sequence of characters matching the production S); the result is a node-set containing the elements in the same document as the context node that have a unique ID equal to any of the tokens in the list.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Initialize the XPath environment
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets intersection() function: node-set set:intersection (node-set, node-set)
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Provides a portable isinf() function to detect whether a double is a +Infinite or -Infinite. Based on trio code http://sourceforge.net/projects/ctrio/
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Provides a portable isnan() function to detect whether a double is a NotaNumber. Based on trio code http://sourceforge.net/projects/ctrio/
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Is the name given a NodeType one.  [38]   NodeType ::=   'comment' | 'text' | 'processing-instruction' | 'node'
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the lang() XPath function boolean lang(string) The lang function returns true or false depending on whether the language of the context node as specified by xml:lang attributes is the same as or is a sublanguage of the language specified by the argument string. The language of the context node is determined by the value of the xml:lang attribute on the context node, or, if the context node has no xml:lang attribute, by the value of the xml:lang attribute on the nearest ancestor of the context node that has an xml:lang attribute. If there is no such attribute, then lang
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the last() XPath function number last() The last function returns the number of nodes in the context node list.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets leading() function: node-set set:leading (node-set, node-set) @nodes1 and @nodes2 are sorted by document order, then #exslSetsLeadingSorted is called.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets leading() function: node-set set:leading (node-set, node-set)
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the local-name() XPath function string local-name(node-set?) The local-name function returns a string containing the local part of the name of the node in the argument node-set that is first in document order. If the node-set is empty or the first node has no name, an empty string is returned. If the argument is omitted it defaults to the context node.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the mod operation on XPath objects: @arg1 / @arg2 The numeric operators convert their operands to numbers as if by calling the number function.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the multiply operation on XPath objects: The numeric operators convert their operands to numbers as if by calling the number function.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the namespace-uri() XPath function string namespace-uri(node-set?) The namespace-uri function returns a string containing the namespace URI of the expanded name of the node in the argument node-set that is first in document order. If the node-set is empty, the first node has no name, or the expanded name has no namespace URI, an empty string is returned. If the argument is omitted it defaults to the context node.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlXPathObjectPtr of type boolean and of value @val
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlXPathObjectPtr of type string and of value @val
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlXPathContext
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlXPathObjectPtr of type double and of value @val
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlXPathObjectPtr of type NodeSet and initialize it with the single Node @val
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlXPathObjectPtr of type NodeSet and initialize it with the Nodeset @val
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlXPathParserContext
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlXPathObjectPtr of type string and of value @val
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlXPathObjectPtr of type Value Tree (XSLT) and initialize it with the tree root @val
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "ancestor" direction the ancestor axis contains the ancestors of the context node; the ancestors of the context node consist of the parent of context node and the parent's parent and so on; the nodes are ordered in reverse document order; thus the parent is the first node on the axis, and the parent's parent is the second node on the axis
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "ancestor-or-self" direction he ancestor-or-self axis contains the context node and ancestors of the context node in reverse document order; thus the context node is the first node on the axis, and the context node's parent the second; parent here is defined the same as with the parent axis.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "attribute" direction TODO: support DTD inherited default attributes
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "child" direction The child axis contains the children of the context node in document order.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "descendant" direction the descendant axis contains the descendants of the context node in document order; a descendant is a child or a child of a child and so on.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "descendant-or-self" direction the descendant-or-self axis contains the context node and the descendants of the context node in document order; thus the context node is the first node on the axis, and the first child of the context node is the second node on the axis
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "following" direction The following axis contains all nodes in the same document as the context node that are after the context node in document order, excluding any descendants and excluding attribute nodes and namespace nodes; the nodes are ordered in document order
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "following-sibling" direction The following-sibling axis contains the following siblings of the context node in document order.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "namespace" direction the namespace axis contains the namespace nodes of the context node; the order of nodes on this axis is implementation-defined; the axis will be empty unless the context node is an element  We keep the XML namespace node at the end of the list.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "parent" direction The parent axis contains the parent of the context node, if there is one.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "preceding" direction the preceding axis contains all nodes in the same document as the context node that are before the context node in document order, excluding any ancestors and excluding attribute nodes and namespace nodes; the nodes are ordered in reverse document order
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "preceding-sibling" direction The preceding-sibling axis contains the preceding siblings of the context node in reverse document order; the first preceding sibling is first on the axis; the sibling preceding that node is the second on the axis and so on.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Traversal function for the "self" direction The self axis contains just the context node itself
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets leading() function: node-set set:leading (node-set, node-set) @nodes is sorted by document order, then #exslSetsNodeLeadingSorted is called.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets leading() function: node-set set:leading (node-set, node-set)
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       add a new xmlNodePtr to an existing NodeSet
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       add a new namespace node to an existing NodeSet
       
       
@@ -16300,175 +16344,175 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       add a new xmlNodePtr to an existing NodeSet, optimized version when we are sure the node is not already in the set.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       checks whether @cur contains @val
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Create a new xmlNodeSetPtr of type double and of value @val
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Removes an xmlNodePtr from an existing NodeSet
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Namespace nodes in libxml don't match the XPath semantic. In a node set the namespace nodes are duplicated and the next pointer is set to the parent node in the XPath semantic. Check if such a node needs to be freed
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Merges two nodesets, all nodes from @val2 are added to @val1 if @val1 is NULL, a new set is created and copied from @val2
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Removes an entry from an existing NodeSet list.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Sort the node set in document order
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets trailing() function: node-set set:trailing (node-set, node-set) @nodes is sorted by document order, then #xmlXPathNodeTrailingSorted is called.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets trailing() function: node-set set:trailing (node-set, node-set)
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the normalize-space() XPath function string normalize-space(string?) The normalize-space function returns the argument string with white space normalized by stripping leading and trailing whitespace and replacing sequences of whitespace characters by a single space. Whitespace characters are the same allowed by the S production in XML. If the argument is omitted, it defaults to the context node converted to a string, in other words the value of the context node.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the equal operation on XPath objects content: @arg1 == @arg2
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the not() XPath function boolean not(boolean) The not function returns true if its argument is false, and false otherwise.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Search in the namespace declaration array of the context for the given namespace name associated to the given prefix
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the number() XPath function number number(object?)
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       allocate a new copy of a given object
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Call this routine to speed up XPath computation on static documents. This stamps all the element nodes with the document order Like for line information, the order is kept in the element->content field, the value stored is actually - the node number (starting at -1) to be able to differentiate from line numbers.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       parse an XML namespace non qualified name.  [NS 3] NCName ::= (Letter | '_') (NCNameChar)*  [NS 4] NCNameChar ::= Letter | Digit | '.' | '-' | '_' | CombiningChar | Extender
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       parse an XML name  [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender  [5] Name ::= (Letter | '_' | ':') (NameChar)*
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Pops a boolean from the stack, handling conversion if needed. Check error with #xmlXPathCheckError.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Pops an external object from the stack, handling conversion if needed. Check error with #xmlXPathCheckError.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Pops a node-set from the stack, handling conversion if needed. Check error with #xmlXPathCheckError.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Pops a number from the stack, handling conversion if needed. Check error with #xmlXPathCheckError.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Pops a string from the stack, handling conversion if needed. Check error with #xmlXPathCheckError.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the position() XPath function number position() The position function returns the position of the context node in the context node list. The first position is 1, and so the last position will be equal to last().
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Registers all default XPath functions in this context
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Register a new function. If @f is NULL it unregisters the function
       
       
@@ -16476,7 +16520,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Registers an external mechanism to do function lookup.
       
       
@@ -16484,7 +16528,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Register a new function. If @f is NULL it unregisters the function
       
       
@@ -16493,7 +16537,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Register a new namespace. If @ns_uri is NULL it unregisters the namespace
       
       
@@ -16501,7 +16545,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Register a new variable value. If @value is NULL it unregisters the variable
       
       
@@ -16509,7 +16553,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       register an external mechanism to do variable lookup
       
       
@@ -16517,7 +16561,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Register a new variable value. If @value is NULL it unregisters the variable
       
       
@@ -16526,140 +16570,140 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Cleanup the XPath context data associated to registered functions
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Cleanup the XPath context data associated to registered variables
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Cleanup the XPath context data associated to registered variables
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Initialize the context to the root of the document
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the round() XPath function number round(number) The round function returns the number that is closest to the argument and that is an integer. If there are two such numbers, then the one that is even is returned.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the starts-with() XPath function boolean starts-with(string, string) The starts-with function returns true if the first argument string starts with the second argument string, and otherwise returns false.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       [30a]  Float  ::= Number ('e' Digits?)?  [30]   Number ::=   Digits ('.' Digits?)? | '.' Digits [31]   Digits ::=   [0-9]+  Compile a Number in the string In complement of the Number expression, this function also handles negative values : '-' Number.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the string() XPath function string string(object?) The string function converts an object to a string as follows: - A node-set is converted to a string by returning the value of the node in the node-set that is first in document order. If the node-set is empty, an empty string is returned. - A number is converted to a string as follows + NaN is converted to the string NaN + positive zero is converted to the string 0 + negative zero is converted to the string 0 + positive infinity is converted to the string Infinity + negative infinity is converted to the string -Infinity + if the number is an integer, the number is represented in decimal form as a Number with no decimal point and no leading zeros, preceded by a minus sign (-) if the number is negative + otherwise, the number is represented in decimal form as a Number including a decimal point with at least one digit before the decimal point and at least one digit after the decimal point, preceded by a minus sign (-) if the number is negative; there must be no leading zeros before the decimal point apart possibly from the one required digit immediately before the decimal point; beyond the one required digit after the decimal point there must be as many, but only as many, more digits as are needed to uniquely distinguish the number from all other IEEE 754 numeric values. - The boolean false value is converted to the string false. The boolean true value is converted to the string true.  If the argument is omitted, it defaults to a node-set with the context node as its only member.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the string-length() XPath function number string-length(string?) The string-length returns the number of characters in the string (see [3.6 Strings]). If the argument is omitted, it defaults to the context node converted to a string, in other words the value of the context node.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the subtraction operation on XPath objects: The numeric operators convert their operands to numbers as if by calling the number function.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the substring-after() XPath function string substring-after(string, string) The substring-after function returns the substring of the first argument string that follows the first occurrence of the second argument string in the first argument string, or the empty stringi if the first argument string does not contain the second argument string. For example, substring-after("1999/04/01","/") returns 04/01, and substring-after("1999/04/01","19") returns 99/04/01.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the substring-before() XPath function string substring-before(string, string) The substring-before function returns the substring of the first argument string that precedes the first occurrence of the second argument string in the first argument string, or the empty string if the first argument string does not contain the second argument string. For example, substring-before("1999/04/01","/") returns 1999.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the substring() XPath function string substring(string, number, number?) The substring function returns the substring of the first argument starting at the position specified in the second argument with length specified in the third argument. For example, substring("12345",2,3) returns "234". If the third argument is not specified, it returns the substring starting at the position specified in the second argument and continuing to the end of the string. For example, substring("12345",2) returns "2345".  More precisely, each character in the string (see [3.6 Strings]) is considered to have a numeric position: the position of the first character is 1, the position of the second character is 2 and so on. The returned substring contains those characters for which the position of the character is greater than or equal to the second argument and, if the third argument is specified, less than the sum of the second and third arguments; the comparisons and addition used for the above follow the standard IEEE 754 rules. Thus: - substring("12345", 1.5, 2.6) returns "234" - substring("12345", 0, 3) returns "12" - substring("12345", 0 div 0, 3) returns "" - substring("12345", 1, 0 div 0) returns "" - substring("12345", -42, 1 div 0) returns "12345" - substring("12345", -1 div 0, 1 div 0) returns ""
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the sum() XPath function number sum(node-set) The sum function returns the sum of the values of the nodes in the argument node-set.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets trailing() function: node-set set:trailing (node-set, node-set) @nodes1 and @nodes2 are sorted by document order, then #xmlXPathTrailingSorted is called.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implements the EXSLT - Sets trailing() function: node-set set:trailing (node-set, node-set)
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the translate() XPath function string translate(string, string, string) The translate function returns the first argument string with occurrences of characters in the second argument string replaced by the character at the corresponding position in the third argument string. For example, translate("bar","abc","ABC") returns the string BAr. If there is a character in the second argument string with no character at a corresponding position in the third argument string (because the second argument string is longer than the third argument string), then occurrences of that character in the first argument string are removed. For example, translate("--aaa--","abc-","ABC")
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the true() XPath function boolean true()
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Implement the unary - operation on an XPath object The numeric operators convert their operands to numbers as if by calling the number function.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Search in the Variable array of the context for the given variable value.
       
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Prototype for callbacks used to plug variable lookup in the XPath engine.
       
       
@@ -16667,7 +16711,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Search in the Variable array of the context for the given variable value.
       
       
@@ -16675,31 +16719,31 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Wraps a string into an XPath object.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Wraps the @val data into an XPath object.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Wrap the Nodeset @val in a new xmlXPathObjectPtr
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Wraps the @val string into an XPath object.
       
       
     
     
-      LIBXML_XPATH_ENABLED
+      defined(LIBXML_XPATH_ENABLED)
       Formats an error message.
       
       
@@ -16708,72 +16752,72 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Build a node list tree copy of the XPointer result. This will drop Attributes and Namespace declarations.
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Evaluate the XPath Location Path in the given context.
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       [8]   Predicate ::=   '[' PredicateExpr ']' [9]   PredicateExpr ::=   Expr  Evaluate a predicate as in xmlXPathEvalPredicate() but for a Location Set instead of a node set
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Free the LocationSet compound (not the actual ranges !).
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       add a new xmlXPathObjectPtr to an existing LocationSet If the location already exist in the set @val is freed.
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlLocationSetPtr of type double and of value @val
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Removes an xmlXPathObjectPtr from an existing LocationSet
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Merges two rangesets, all ranges from @val2 are added to @val1
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Removes an entry from an existing LocationSet list.
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlXPathObjectPtr of type range using a single nodes
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new XPointer context
       
       
@@ -16781,20 +16825,20 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlXPathObjectPtr of type LocationSet and initialize it with all the nodes from @set
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlXPathObjectPtr of type LocationSet and initialize it with the single range made of the two nodes @start and @end
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlXPathObjectPtr of type range
       
       
@@ -16803,49 +16847,49 @@ actually an xmlCharEncoding'/>
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlXPathObjectPtr of type range from a not to an object
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlXPathObjectPtr of type range from a node to a point
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlXPathObjectPtr of type range using 2 nodes
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlXPathObjectPtr of type range from a point to a node
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Create a new xmlXPathObjectPtr of type range using 2 Points
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Implement the range-to() XPointer function
       
       
       
     
     
-      LIBXML_XPTR_ENABLED
+      defined(LIBXML_XPTR_ENABLED)
       Wrap the LocationSet @val in a new xmlXPathObjectPtr
       
       
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index a7a12ead..64611121 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -14605,38 +14605,6 @@
         
           
         
-        
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-        
         
           
         
@@ -15148,6 +15116,8 @@
         
         
           
+          
+          
         
         
           
@@ -17224,6 +17194,9 @@
           
           
         
+        
+          
+        
         
           
         
@@ -17509,8 +17482,6 @@
           
           
           
-          
-          
           
           
           
@@ -17521,10 +17492,7 @@
           
           
           
-          
-          
           
-          
           
           
           
@@ -17544,6 +17512,7 @@
           
         
         
+          
           
           
           
@@ -17818,8 +17787,6 @@
           
           
           
-          
-          
           
           
           
@@ -18245,6 +18212,7 @@
           
         
         
+          
           
         
         
@@ -18520,7 +18488,6 @@
           
           
           
-          
           
         
         
@@ -18528,6 +18495,7 @@
         
         
           
+          
           
           
           
@@ -18589,6 +18557,8 @@
         
         
           
+          
+          
         
         
           
@@ -18875,6 +18845,7 @@
           
           
           
+          
           
           
           
@@ -20213,6 +20184,7 @@
         
           
           
+          
           
           
           
@@ -20452,11 +20424,7 @@
         
           
           
-          
-          
-          
           
-          
           
           
           
@@ -20603,6 +20571,10 @@
         
           
         
+        
+          
+          
+        
         
           
           
@@ -20692,6 +20664,7 @@
         
         
           
+          
           
           
           
@@ -20891,6 +20864,7 @@
           
         
         
+          
           
           
           
@@ -20953,6 +20927,7 @@
           
         
         
+          
           
           
           
@@ -21379,6 +21354,8 @@
         
           
           
+          
+          
           
           
           
@@ -21487,6 +21464,7 @@
         
           
           
+          
           
           
           
@@ -21534,6 +21512,9 @@
         
           
         
+        
+          
+        
         
           
           
@@ -21988,10 +21969,7 @@
           
           
           
-          
-          
           
-          
           
           
           
@@ -22072,9 +22050,7 @@
           
           
           
-          
           
-          
           
           
           
@@ -22323,6 +22299,8 @@
         
         
           
+          
+          
           
           
           
@@ -22443,8 +22421,6 @@
           
           
           
-          
-          
           
         
         
@@ -22779,10 +22755,7 @@
         
           
           
-          
-          
           
-          
           
         
         
@@ -22882,7 +22855,6 @@
           
           
           
-          
           
         
         
@@ -22924,6 +22896,7 @@
         
         
           
+          
           
         
         
@@ -23681,7 +23654,6 @@
         
         
           
-          
         
         
           
@@ -23905,6 +23877,7 @@
           
           
           
+          
         
         
           
@@ -24499,6 +24472,7 @@
           
         
         
+          
           
         
         
@@ -24910,7 +24884,6 @@
           
           
           
-          
           
           
           
@@ -25066,6 +25039,7 @@
         
         
           
+          
           
           
           
@@ -25078,6 +25052,8 @@
         
         
           
+          
+          
           
           
           
@@ -25418,6 +25394,7 @@
         
         
           
+          
           
         
         
@@ -25460,7 +25437,9 @@
         
           
           
+          
           
+          
           
           
         
@@ -25740,6 +25719,7 @@
           
         
         
+          
           
           
           
@@ -26005,6 +25985,7 @@
           
         
         
+          
           
           
           
@@ -26214,8 +26195,6 @@
         
           
           
-          
-          
           
         
         
@@ -26430,7 +26409,6 @@
           
           
           
-          
           
           
         
@@ -26584,6 +26562,9 @@
         
           
         
+        
+          
+        
         
           
           
diff --git a/elfgcchack.h b/elfgcchack.h
index 3f430fef..6f1bfde4 100644
--- a/elfgcchack.h
+++ b/elfgcchack.h
@@ -66,369 +66,343 @@ extern __typeof (__xmlGenericErrorContext) __xmlGenericErrorContext __attribute(
 
 /* list generated from libxml2-api.xml */
 
-#ifdef LIBXML_DOCB_ENABLED
+#if defined(LIBXML_DOCB_ENABLED)
 extern __typeof (docbCreatePushParserCtxt) docbCreatePushParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (docbCreatePushParserCtxt) docbCreatePushParserCtxt __attribute((alias("docbCreatePushParserCtxt__internal_alias")));
 #define docbCreatePushParserCtxt docbCreatePushParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlAttrAllowed) htmlAttrAllowed__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlAttrAllowed) htmlAttrAllowed __attribute((alias("htmlAttrAllowed__internal_alias")));
 #define htmlAttrAllowed htmlAttrAllowed__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlAutoCloseTag) htmlAutoCloseTag__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlAutoCloseTag) htmlAutoCloseTag __attribute((alias("htmlAutoCloseTag__internal_alias")));
 #define htmlAutoCloseTag htmlAutoCloseTag__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlCreateFileParserCtxt) htmlCreateFileParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCreateFileParserCtxt) htmlCreateFileParserCtxt __attribute((alias("htmlCreateFileParserCtxt__internal_alias")));
 #define htmlCreateFileParserCtxt htmlCreateFileParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlCreateMemoryParserCtxt) htmlCreateMemoryParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCreateMemoryParserCtxt) htmlCreateMemoryParserCtxt __attribute((alias("htmlCreateMemoryParserCtxt__internal_alias")));
 #define htmlCreateMemoryParserCtxt htmlCreateMemoryParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_PUSH_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_PUSH_ENABLED)
 extern __typeof (htmlCreatePushParserCtxt) htmlCreatePushParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCreatePushParserCtxt) htmlCreatePushParserCtxt __attribute((alias("htmlCreatePushParserCtxt__internal_alias")));
 #define htmlCreatePushParserCtxt htmlCreatePushParserCtxt__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlCtxtReadDoc) htmlCtxtReadDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCtxtReadDoc) htmlCtxtReadDoc __attribute((alias("htmlCtxtReadDoc__internal_alias")));
 #define htmlCtxtReadDoc htmlCtxtReadDoc__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlCtxtReadFd) htmlCtxtReadFd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCtxtReadFd) htmlCtxtReadFd __attribute((alias("htmlCtxtReadFd__internal_alias")));
 #define htmlCtxtReadFd htmlCtxtReadFd__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlCtxtReadFile) htmlCtxtReadFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCtxtReadFile) htmlCtxtReadFile __attribute((alias("htmlCtxtReadFile__internal_alias")));
 #define htmlCtxtReadFile htmlCtxtReadFile__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlCtxtReadIO) htmlCtxtReadIO__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCtxtReadIO) htmlCtxtReadIO __attribute((alias("htmlCtxtReadIO__internal_alias")));
 #define htmlCtxtReadIO htmlCtxtReadIO__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlCtxtReadMemory) htmlCtxtReadMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCtxtReadMemory) htmlCtxtReadMemory __attribute((alias("htmlCtxtReadMemory__internal_alias")));
 #define htmlCtxtReadMemory htmlCtxtReadMemory__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlCtxtReset) htmlCtxtReset__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCtxtReset) htmlCtxtReset __attribute((alias("htmlCtxtReset__internal_alias")));
 #define htmlCtxtReset htmlCtxtReset__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlCtxtUseOptions) htmlCtxtUseOptions__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlCtxtUseOptions) htmlCtxtUseOptions __attribute((alias("htmlCtxtUseOptions__internal_alias")));
 #define htmlCtxtUseOptions htmlCtxtUseOptions__internal_alias
 #endif
 
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlDefaultSAXHandlerInit) htmlDefaultSAXHandlerInit__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlDefaultSAXHandlerInit) htmlDefaultSAXHandlerInit __attribute((alias("htmlDefaultSAXHandlerInit__internal_alias")));
 #define htmlDefaultSAXHandlerInit htmlDefaultSAXHandlerInit__internal_alias
+#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlDocContentDumpFormatOutput) htmlDocContentDumpFormatOutput__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlDocContentDumpFormatOutput) htmlDocContentDumpFormatOutput __attribute((alias("htmlDocContentDumpFormatOutput__internal_alias")));
 #define htmlDocContentDumpFormatOutput htmlDocContentDumpFormatOutput__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlDocContentDumpOutput) htmlDocContentDumpOutput__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlDocContentDumpOutput) htmlDocContentDumpOutput __attribute((alias("htmlDocContentDumpOutput__internal_alias")));
 #define htmlDocContentDumpOutput htmlDocContentDumpOutput__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlDocDump) htmlDocDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlDocDump) htmlDocDump __attribute((alias("htmlDocDump__internal_alias")));
 #define htmlDocDump htmlDocDump__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlDocDumpMemory) htmlDocDumpMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlDocDumpMemory) htmlDocDumpMemory __attribute((alias("htmlDocDumpMemory__internal_alias")));
 #define htmlDocDumpMemory htmlDocDumpMemory__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlElementAllowedHere) htmlElementAllowedHere__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlElementAllowedHere) htmlElementAllowedHere __attribute((alias("htmlElementAllowedHere__internal_alias")));
 #define htmlElementAllowedHere htmlElementAllowedHere__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlElementStatusHere) htmlElementStatusHere__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlElementStatusHere) htmlElementStatusHere __attribute((alias("htmlElementStatusHere__internal_alias")));
 #define htmlElementStatusHere htmlElementStatusHere__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlEncodeEntities) htmlEncodeEntities__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlEncodeEntities) htmlEncodeEntities __attribute((alias("htmlEncodeEntities__internal_alias")));
 #define htmlEncodeEntities htmlEncodeEntities__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlEntityLookup) htmlEntityLookup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlEntityLookup) htmlEntityLookup __attribute((alias("htmlEntityLookup__internal_alias")));
 #define htmlEntityLookup htmlEntityLookup__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlEntityValueLookup) htmlEntityValueLookup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlEntityValueLookup) htmlEntityValueLookup __attribute((alias("htmlEntityValueLookup__internal_alias")));
 #define htmlEntityValueLookup htmlEntityValueLookup__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlFreeParserCtxt) htmlFreeParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlFreeParserCtxt) htmlFreeParserCtxt __attribute((alias("htmlFreeParserCtxt__internal_alias")));
 #define htmlFreeParserCtxt htmlFreeParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlGetMetaEncoding) htmlGetMetaEncoding__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlGetMetaEncoding) htmlGetMetaEncoding __attribute((alias("htmlGetMetaEncoding__internal_alias")));
 #define htmlGetMetaEncoding htmlGetMetaEncoding__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlHandleOmittedElem) htmlHandleOmittedElem__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlHandleOmittedElem) htmlHandleOmittedElem __attribute((alias("htmlHandleOmittedElem__internal_alias")));
 #define htmlHandleOmittedElem htmlHandleOmittedElem__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlInitAutoClose) htmlInitAutoClose__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlInitAutoClose) htmlInitAutoClose __attribute((alias("htmlInitAutoClose__internal_alias")));
 #define htmlInitAutoClose htmlInitAutoClose__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlIsAutoClosed) htmlIsAutoClosed__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlIsAutoClosed) htmlIsAutoClosed __attribute((alias("htmlIsAutoClosed__internal_alias")));
 #define htmlIsAutoClosed htmlIsAutoClosed__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlIsBooleanAttr) htmlIsBooleanAttr__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlIsBooleanAttr) htmlIsBooleanAttr __attribute((alias("htmlIsBooleanAttr__internal_alias")));
 #define htmlIsBooleanAttr htmlIsBooleanAttr__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlIsScriptAttribute) htmlIsScriptAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlIsScriptAttribute) htmlIsScriptAttribute __attribute((alias("htmlIsScriptAttribute__internal_alias")));
 #define htmlIsScriptAttribute htmlIsScriptAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlNewDoc) htmlNewDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlNewDoc) htmlNewDoc __attribute((alias("htmlNewDoc__internal_alias")));
 #define htmlNewDoc htmlNewDoc__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlNewDocNoDtD) htmlNewDocNoDtD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlNewDocNoDtD) htmlNewDocNoDtD __attribute((alias("htmlNewDocNoDtD__internal_alias")));
 #define htmlNewDocNoDtD htmlNewDocNoDtD__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlNodeDump) htmlNodeDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlNodeDump) htmlNodeDump __attribute((alias("htmlNodeDump__internal_alias")));
 #define htmlNodeDump htmlNodeDump__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlNodeDumpFile) htmlNodeDumpFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlNodeDumpFile) htmlNodeDumpFile __attribute((alias("htmlNodeDumpFile__internal_alias")));
 #define htmlNodeDumpFile htmlNodeDumpFile__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlNodeDumpFileFormat) htmlNodeDumpFileFormat__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlNodeDumpFileFormat) htmlNodeDumpFileFormat __attribute((alias("htmlNodeDumpFileFormat__internal_alias")));
 #define htmlNodeDumpFileFormat htmlNodeDumpFileFormat__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlNodeDumpFormatOutput) htmlNodeDumpFormatOutput__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlNodeDumpFormatOutput) htmlNodeDumpFormatOutput __attribute((alias("htmlNodeDumpFormatOutput__internal_alias")));
 #define htmlNodeDumpFormatOutput htmlNodeDumpFormatOutput__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlNodeDumpOutput) htmlNodeDumpOutput__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlNodeDumpOutput) htmlNodeDumpOutput __attribute((alias("htmlNodeDumpOutput__internal_alias")));
 #define htmlNodeDumpOutput htmlNodeDumpOutput__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlNodeStatus) htmlNodeStatus__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlNodeStatus) htmlNodeStatus __attribute((alias("htmlNodeStatus__internal_alias")));
 #define htmlNodeStatus htmlNodeStatus__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlParseCharRef) htmlParseCharRef__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlParseCharRef) htmlParseCharRef __attribute((alias("htmlParseCharRef__internal_alias")));
 #define htmlParseCharRef htmlParseCharRef__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_PUSH_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_PUSH_ENABLED)
 extern __typeof (htmlParseChunk) htmlParseChunk__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlParseChunk) htmlParseChunk __attribute((alias("htmlParseChunk__internal_alias")));
 #define htmlParseChunk htmlParseChunk__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlParseDoc) htmlParseDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlParseDoc) htmlParseDoc __attribute((alias("htmlParseDoc__internal_alias")));
 #define htmlParseDoc htmlParseDoc__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlParseDocument) htmlParseDocument__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlParseDocument) htmlParseDocument __attribute((alias("htmlParseDocument__internal_alias")));
 #define htmlParseDocument htmlParseDocument__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlParseElement) htmlParseElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlParseElement) htmlParseElement __attribute((alias("htmlParseElement__internal_alias")));
 #define htmlParseElement htmlParseElement__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlParseEntityRef) htmlParseEntityRef__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlParseEntityRef) htmlParseEntityRef __attribute((alias("htmlParseEntityRef__internal_alias")));
 #define htmlParseEntityRef htmlParseEntityRef__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlParseFile) htmlParseFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlParseFile) htmlParseFile __attribute((alias("htmlParseFile__internal_alias")));
 #define htmlParseFile htmlParseFile__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlReadDoc) htmlReadDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlReadDoc) htmlReadDoc __attribute((alias("htmlReadDoc__internal_alias")));
 #define htmlReadDoc htmlReadDoc__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlReadFd) htmlReadFd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlReadFd) htmlReadFd __attribute((alias("htmlReadFd__internal_alias")));
 #define htmlReadFd htmlReadFd__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlReadFile) htmlReadFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlReadFile) htmlReadFile __attribute((alias("htmlReadFile__internal_alias")));
 #define htmlReadFile htmlReadFile__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlReadIO) htmlReadIO__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlReadIO) htmlReadIO __attribute((alias("htmlReadIO__internal_alias")));
 #define htmlReadIO htmlReadIO__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlReadMemory) htmlReadMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlReadMemory) htmlReadMemory __attribute((alias("htmlReadMemory__internal_alias")));
 #define htmlReadMemory htmlReadMemory__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlSAXParseDoc) htmlSAXParseDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlSAXParseDoc) htmlSAXParseDoc __attribute((alias("htmlSAXParseDoc__internal_alias")));
 #define htmlSAXParseDoc htmlSAXParseDoc__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlSAXParseFile) htmlSAXParseFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlSAXParseFile) htmlSAXParseFile __attribute((alias("htmlSAXParseFile__internal_alias")));
 #define htmlSAXParseFile htmlSAXParseFile__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlSaveFile) htmlSaveFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlSaveFile) htmlSaveFile __attribute((alias("htmlSaveFile__internal_alias")));
 #define htmlSaveFile htmlSaveFile__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlSaveFileEnc) htmlSaveFileEnc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlSaveFileEnc) htmlSaveFileEnc __attribute((alias("htmlSaveFileEnc__internal_alias")));
 #define htmlSaveFileEnc htmlSaveFileEnc__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (htmlSaveFileFormat) htmlSaveFileFormat__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlSaveFileFormat) htmlSaveFileFormat __attribute((alias("htmlSaveFileFormat__internal_alias")));
 #define htmlSaveFileFormat htmlSaveFileFormat__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlSetMetaEncoding) htmlSetMetaEncoding__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlSetMetaEncoding) htmlSetMetaEncoding __attribute((alias("htmlSetMetaEncoding__internal_alias")));
 #define htmlSetMetaEncoding htmlSetMetaEncoding__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (htmlTagLookup) htmlTagLookup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (htmlTagLookup) htmlTagLookup __attribute((alias("htmlTagLookup__internal_alias")));
 #define htmlTagLookup htmlTagLookup__internal_alias
@@ -458,57 +432,55 @@ extern __typeof (nodePush) nodePush__internal_alias __attribute((visibility("hid
 extern __typeof (nodePush) nodePush __attribute((alias("nodePush__internal_alias")));
 #define nodePush nodePush__internal_alias
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (valuePop) valuePop__internal_alias __attribute((visibility("hidden")));
 extern __typeof (valuePop) valuePop __attribute((alias("valuePop__internal_alias")));
 #define valuePop valuePop__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (valuePush) valuePush__internal_alias __attribute((visibility("hidden")));
 extern __typeof (valuePush) valuePush __attribute((alias("valuePush__internal_alias")));
 #define valuePush valuePush__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlACatalogAdd) xmlACatalogAdd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlACatalogAdd) xmlACatalogAdd __attribute((alias("xmlACatalogAdd__internal_alias")));
 #define xmlACatalogAdd xmlACatalogAdd__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlACatalogDump) xmlACatalogDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlACatalogDump) xmlACatalogDump __attribute((alias("xmlACatalogDump__internal_alias")));
 #define xmlACatalogDump xmlACatalogDump__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlACatalogRemove) xmlACatalogRemove__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlACatalogRemove) xmlACatalogRemove __attribute((alias("xmlACatalogRemove__internal_alias")));
 #define xmlACatalogRemove xmlACatalogRemove__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlACatalogResolve) xmlACatalogResolve__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlACatalogResolve) xmlACatalogResolve __attribute((alias("xmlACatalogResolve__internal_alias")));
 #define xmlACatalogResolve xmlACatalogResolve__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlACatalogResolvePublic) xmlACatalogResolvePublic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlACatalogResolvePublic) xmlACatalogResolvePublic __attribute((alias("xmlACatalogResolvePublic__internal_alias")));
 #define xmlACatalogResolvePublic xmlACatalogResolvePublic__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlACatalogResolveSystem) xmlACatalogResolveSystem__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlACatalogResolveSystem) xmlACatalogResolveSystem __attribute((alias("xmlACatalogResolveSystem__internal_alias")));
 #define xmlACatalogResolveSystem xmlACatalogResolveSystem__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlACatalogResolveURI) xmlACatalogResolveURI__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlACatalogResolveURI) xmlACatalogResolveURI __attribute((alias("xmlACatalogResolveURI__internal_alias")));
 #define xmlACatalogResolveURI xmlACatalogResolveURI__internal_alias
@@ -554,7 +526,7 @@ extern __typeof (xmlAddNotationDecl) xmlAddNotationDecl__internal_alias __attrib
 extern __typeof (xmlAddNotationDecl) xmlAddNotationDecl __attribute((alias("xmlAddNotationDecl__internal_alias")));
 #define xmlAddNotationDecl xmlAddNotationDecl__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlAddPrevSibling) xmlAddPrevSibling__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAddPrevSibling) xmlAddPrevSibling __attribute((alias("xmlAddPrevSibling__internal_alias")));
 #define xmlAddPrevSibling xmlAddPrevSibling__internal_alias
@@ -568,7 +540,7 @@ extern __typeof (xmlAddSibling) xmlAddSibling__internal_alias __attribute((visib
 extern __typeof (xmlAddSibling) xmlAddSibling __attribute((alias("xmlAddSibling__internal_alias")));
 #define xmlAddSibling xmlAddSibling__internal_alias
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlAllocOutputBuffer) xmlAllocOutputBuffer__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAllocOutputBuffer) xmlAllocOutputBuffer __attribute((alias("xmlAllocOutputBuffer__internal_alias")));
 #define xmlAllocOutputBuffer xmlAllocOutputBuffer__internal_alias
@@ -578,107 +550,109 @@ extern __typeof (xmlAllocParserInputBuffer) xmlAllocParserInputBuffer__internal_
 extern __typeof (xmlAllocParserInputBuffer) xmlAllocParserInputBuffer __attribute((alias("xmlAllocParserInputBuffer__internal_alias")));
 #define xmlAllocParserInputBuffer xmlAllocParserInputBuffer__internal_alias
 
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlAttrSerializeTxtContent) xmlAttrSerializeTxtContent__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAttrSerializeTxtContent) xmlAttrSerializeTxtContent __attribute((alias("xmlAttrSerializeTxtContent__internal_alias")));
 #define xmlAttrSerializeTxtContent xmlAttrSerializeTxtContent__internal_alias
+#endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataCompile) xmlAutomataCompile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataCompile) xmlAutomataCompile __attribute((alias("xmlAutomataCompile__internal_alias")));
 #define xmlAutomataCompile xmlAutomataCompile__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataGetInitState) xmlAutomataGetInitState__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataGetInitState) xmlAutomataGetInitState __attribute((alias("xmlAutomataGetInitState__internal_alias")));
 #define xmlAutomataGetInitState xmlAutomataGetInitState__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataIsDeterminist) xmlAutomataIsDeterminist__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataIsDeterminist) xmlAutomataIsDeterminist __attribute((alias("xmlAutomataIsDeterminist__internal_alias")));
 #define xmlAutomataIsDeterminist xmlAutomataIsDeterminist__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewAllTrans) xmlAutomataNewAllTrans__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewAllTrans) xmlAutomataNewAllTrans __attribute((alias("xmlAutomataNewAllTrans__internal_alias")));
 #define xmlAutomataNewAllTrans xmlAutomataNewAllTrans__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewCountTrans) xmlAutomataNewCountTrans__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewCountTrans) xmlAutomataNewCountTrans __attribute((alias("xmlAutomataNewCountTrans__internal_alias")));
 #define xmlAutomataNewCountTrans xmlAutomataNewCountTrans__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewCountTrans2) xmlAutomataNewCountTrans2__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewCountTrans2) xmlAutomataNewCountTrans2 __attribute((alias("xmlAutomataNewCountTrans2__internal_alias")));
 #define xmlAutomataNewCountTrans2 xmlAutomataNewCountTrans2__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewCountedTrans) xmlAutomataNewCountedTrans__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewCountedTrans) xmlAutomataNewCountedTrans __attribute((alias("xmlAutomataNewCountedTrans__internal_alias")));
 #define xmlAutomataNewCountedTrans xmlAutomataNewCountedTrans__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewCounter) xmlAutomataNewCounter__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewCounter) xmlAutomataNewCounter __attribute((alias("xmlAutomataNewCounter__internal_alias")));
 #define xmlAutomataNewCounter xmlAutomataNewCounter__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewCounterTrans) xmlAutomataNewCounterTrans__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewCounterTrans) xmlAutomataNewCounterTrans __attribute((alias("xmlAutomataNewCounterTrans__internal_alias")));
 #define xmlAutomataNewCounterTrans xmlAutomataNewCounterTrans__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewEpsilon) xmlAutomataNewEpsilon__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewEpsilon) xmlAutomataNewEpsilon __attribute((alias("xmlAutomataNewEpsilon__internal_alias")));
 #define xmlAutomataNewEpsilon xmlAutomataNewEpsilon__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewOnceTrans) xmlAutomataNewOnceTrans__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewOnceTrans) xmlAutomataNewOnceTrans __attribute((alias("xmlAutomataNewOnceTrans__internal_alias")));
 #define xmlAutomataNewOnceTrans xmlAutomataNewOnceTrans__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewOnceTrans2) xmlAutomataNewOnceTrans2__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewOnceTrans2) xmlAutomataNewOnceTrans2 __attribute((alias("xmlAutomataNewOnceTrans2__internal_alias")));
 #define xmlAutomataNewOnceTrans2 xmlAutomataNewOnceTrans2__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewState) xmlAutomataNewState__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewState) xmlAutomataNewState __attribute((alias("xmlAutomataNewState__internal_alias")));
 #define xmlAutomataNewState xmlAutomataNewState__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewTransition) xmlAutomataNewTransition__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewTransition) xmlAutomataNewTransition __attribute((alias("xmlAutomataNewTransition__internal_alias")));
 #define xmlAutomataNewTransition xmlAutomataNewTransition__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataNewTransition2) xmlAutomataNewTransition2__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataNewTransition2) xmlAutomataNewTransition2 __attribute((alias("xmlAutomataNewTransition2__internal_alias")));
 #define xmlAutomataNewTransition2 xmlAutomataNewTransition2__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlAutomataSetFinalState) xmlAutomataSetFinalState__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlAutomataSetFinalState) xmlAutomataSetFinalState __attribute((alias("xmlAutomataSetFinalState__internal_alias")));
 #define xmlAutomataSetFinalState xmlAutomataSetFinalState__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlBoolToText) xmlBoolToText__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlBoolToText) xmlBoolToText __attribute((alias("xmlBoolToText__internal_alias")));
 #define xmlBoolToText xmlBoolToText__internal_alias
@@ -776,159 +750,149 @@ extern __typeof (xmlByteConsumed) xmlByteConsumed__internal_alias __attribute((v
 extern __typeof (xmlByteConsumed) xmlByteConsumed __attribute((alias("xmlByteConsumed__internal_alias")));
 #define xmlByteConsumed xmlByteConsumed__internal_alias
 
-#ifdef LIBXML_C14N_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlC14NDocDumpMemory) xmlC14NDocDumpMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlC14NDocDumpMemory) xmlC14NDocDumpMemory __attribute((alias("xmlC14NDocDumpMemory__internal_alias")));
 #define xmlC14NDocDumpMemory xmlC14NDocDumpMemory__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_C14N_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlC14NDocSave) xmlC14NDocSave__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlC14NDocSave) xmlC14NDocSave __attribute((alias("xmlC14NDocSave__internal_alias")));
 #define xmlC14NDocSave xmlC14NDocSave__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_C14N_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlC14NDocSaveTo) xmlC14NDocSaveTo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlC14NDocSaveTo) xmlC14NDocSaveTo __attribute((alias("xmlC14NDocSaveTo__internal_alias")));
 #define xmlC14NDocSaveTo xmlC14NDocSaveTo__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_C14N_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlC14NExecute) xmlC14NExecute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlC14NExecute) xmlC14NExecute __attribute((alias("xmlC14NExecute__internal_alias")));
 #define xmlC14NExecute xmlC14NExecute__internal_alias
 #endif
-#endif
 
 extern __typeof (xmlCanonicPath) xmlCanonicPath__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCanonicPath) xmlCanonicPath __attribute((alias("xmlCanonicPath__internal_alias")));
 #define xmlCanonicPath xmlCanonicPath__internal_alias
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogAdd) xmlCatalogAdd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogAdd) xmlCatalogAdd __attribute((alias("xmlCatalogAdd__internal_alias")));
 #define xmlCatalogAdd xmlCatalogAdd__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogAddLocal) xmlCatalogAddLocal__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogAddLocal) xmlCatalogAddLocal __attribute((alias("xmlCatalogAddLocal__internal_alias")));
 #define xmlCatalogAddLocal xmlCatalogAddLocal__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogCleanup) xmlCatalogCleanup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogCleanup) xmlCatalogCleanup __attribute((alias("xmlCatalogCleanup__internal_alias")));
 #define xmlCatalogCleanup xmlCatalogCleanup__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogConvert) xmlCatalogConvert__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogConvert) xmlCatalogConvert __attribute((alias("xmlCatalogConvert__internal_alias")));
 #define xmlCatalogConvert xmlCatalogConvert__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlCatalogDump) xmlCatalogDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogDump) xmlCatalogDump __attribute((alias("xmlCatalogDump__internal_alias")));
 #define xmlCatalogDump xmlCatalogDump__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogFreeLocal) xmlCatalogFreeLocal__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogFreeLocal) xmlCatalogFreeLocal __attribute((alias("xmlCatalogFreeLocal__internal_alias")));
 #define xmlCatalogFreeLocal xmlCatalogFreeLocal__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogGetDefaults) xmlCatalogGetDefaults__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogGetDefaults) xmlCatalogGetDefaults __attribute((alias("xmlCatalogGetDefaults__internal_alias")));
 #define xmlCatalogGetDefaults xmlCatalogGetDefaults__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogGetPublic) xmlCatalogGetPublic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogGetPublic) xmlCatalogGetPublic __attribute((alias("xmlCatalogGetPublic__internal_alias")));
 #define xmlCatalogGetPublic xmlCatalogGetPublic__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogGetSystem) xmlCatalogGetSystem__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogGetSystem) xmlCatalogGetSystem __attribute((alias("xmlCatalogGetSystem__internal_alias")));
 #define xmlCatalogGetSystem xmlCatalogGetSystem__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogIsEmpty) xmlCatalogIsEmpty__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogIsEmpty) xmlCatalogIsEmpty __attribute((alias("xmlCatalogIsEmpty__internal_alias")));
 #define xmlCatalogIsEmpty xmlCatalogIsEmpty__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogLocalResolve) xmlCatalogLocalResolve__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogLocalResolve) xmlCatalogLocalResolve __attribute((alias("xmlCatalogLocalResolve__internal_alias")));
 #define xmlCatalogLocalResolve xmlCatalogLocalResolve__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogLocalResolveURI) xmlCatalogLocalResolveURI__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogLocalResolveURI) xmlCatalogLocalResolveURI __attribute((alias("xmlCatalogLocalResolveURI__internal_alias")));
 #define xmlCatalogLocalResolveURI xmlCatalogLocalResolveURI__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogRemove) xmlCatalogRemove__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogRemove) xmlCatalogRemove __attribute((alias("xmlCatalogRemove__internal_alias")));
 #define xmlCatalogRemove xmlCatalogRemove__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogResolve) xmlCatalogResolve__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogResolve) xmlCatalogResolve __attribute((alias("xmlCatalogResolve__internal_alias")));
 #define xmlCatalogResolve xmlCatalogResolve__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogResolvePublic) xmlCatalogResolvePublic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogResolvePublic) xmlCatalogResolvePublic __attribute((alias("xmlCatalogResolvePublic__internal_alias")));
 #define xmlCatalogResolvePublic xmlCatalogResolvePublic__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogResolveSystem) xmlCatalogResolveSystem__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogResolveSystem) xmlCatalogResolveSystem __attribute((alias("xmlCatalogResolveSystem__internal_alias")));
 #define xmlCatalogResolveSystem xmlCatalogResolveSystem__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogResolveURI) xmlCatalogResolveURI__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogResolveURI) xmlCatalogResolveURI __attribute((alias("xmlCatalogResolveURI__internal_alias")));
 #define xmlCatalogResolveURI xmlCatalogResolveURI__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogSetDebug) xmlCatalogSetDebug__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogSetDebug) xmlCatalogSetDebug __attribute((alias("xmlCatalogSetDebug__internal_alias")));
 #define xmlCatalogSetDebug xmlCatalogSetDebug__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogSetDefaultPrefer) xmlCatalogSetDefaultPrefer__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogSetDefaultPrefer) xmlCatalogSetDefaultPrefer __attribute((alias("xmlCatalogSetDefaultPrefer__internal_alias")));
 #define xmlCatalogSetDefaultPrefer xmlCatalogSetDefaultPrefer__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlCatalogSetDefaults) xmlCatalogSetDefaults__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCatalogSetDefaults) xmlCatalogSetDefaults __attribute((alias("xmlCatalogSetDefaults__internal_alias")));
 #define xmlCatalogSetDefaults xmlCatalogSetDefaults__internal_alias
@@ -978,9 +942,11 @@ extern __typeof (xmlCheckUTF8) xmlCheckUTF8__internal_alias __attribute((visibil
 extern __typeof (xmlCheckUTF8) xmlCheckUTF8 __attribute((alias("xmlCheckUTF8__internal_alias")));
 #define xmlCheckUTF8 xmlCheckUTF8__internal_alias
 
+#if !defined(LIBXML2_COMPILING_MSCCDEF)
 extern __typeof (xmlCheckVersion) xmlCheckVersion__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCheckVersion) xmlCheckVersion __attribute((alias("xmlCheckVersion__internal_alias")));
 #define xmlCheckVersion xmlCheckVersion__internal_alias
+#endif
 
 extern __typeof (xmlCleanupCharEncodingHandlers) xmlCleanupCharEncodingHandlers__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCleanupCharEncodingHandlers) xmlCleanupCharEncodingHandlers __attribute((alias("xmlCleanupCharEncodingHandlers__internal_alias")));
@@ -1002,7 +968,7 @@ extern __typeof (xmlCleanupMemory) xmlCleanupMemory__internal_alias __attribute(
 extern __typeof (xmlCleanupMemory) xmlCleanupMemory __attribute((alias("xmlCleanupMemory__internal_alias")));
 #define xmlCleanupMemory xmlCleanupMemory__internal_alias
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlCleanupOutputCallbacks) xmlCleanupOutputCallbacks__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCleanupOutputCallbacks) xmlCleanupOutputCallbacks __attribute((alias("xmlCleanupOutputCallbacks__internal_alias")));
 #define xmlCleanupOutputCallbacks xmlCleanupOutputCallbacks__internal_alias
@@ -1012,9 +978,11 @@ extern __typeof (xmlCleanupParser) xmlCleanupParser__internal_alias __attribute(
 extern __typeof (xmlCleanupParser) xmlCleanupParser __attribute((alias("xmlCleanupParser__internal_alias")));
 #define xmlCleanupParser xmlCleanupParser__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlCleanupPredefinedEntities) xmlCleanupPredefinedEntities__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCleanupPredefinedEntities) xmlCleanupPredefinedEntities __attribute((alias("xmlCleanupPredefinedEntities__internal_alias")));
 #define xmlCleanupPredefinedEntities xmlCleanupPredefinedEntities__internal_alias
+#endif
 
 extern __typeof (xmlCleanupThreads) xmlCleanupThreads__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCleanupThreads) xmlCleanupThreads __attribute((alias("xmlCleanupThreads__internal_alias")));
@@ -1028,15 +996,17 @@ extern __typeof (xmlClearParserCtxt) xmlClearParserCtxt__internal_alias __attrib
 extern __typeof (xmlClearParserCtxt) xmlClearParserCtxt __attribute((alias("xmlClearParserCtxt__internal_alias")));
 #define xmlClearParserCtxt xmlClearParserCtxt__internal_alias
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlConvertSGMLCatalog) xmlConvertSGMLCatalog__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlConvertSGMLCatalog) xmlConvertSGMLCatalog __attribute((alias("xmlConvertSGMLCatalog__internal_alias")));
 #define xmlConvertSGMLCatalog xmlConvertSGMLCatalog__internal_alias
 #endif
 
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlCopyAttributeTable) xmlCopyAttributeTable__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyAttributeTable) xmlCopyAttributeTable __attribute((alias("xmlCopyAttributeTable__internal_alias")));
 #define xmlCopyAttributeTable xmlCopyAttributeTable__internal_alias
+#endif
 
 extern __typeof (xmlCopyChar) xmlCopyChar__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyChar) xmlCopyChar __attribute((alias("xmlCopyChar__internal_alias")));
@@ -1046,13 +1016,13 @@ extern __typeof (xmlCopyCharMultiByte) xmlCopyCharMultiByte__internal_alias __at
 extern __typeof (xmlCopyCharMultiByte) xmlCopyCharMultiByte __attribute((alias("xmlCopyCharMultiByte__internal_alias")));
 #define xmlCopyCharMultiByte xmlCopyCharMultiByte__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlCopyDoc) xmlCopyDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyDoc) xmlCopyDoc __attribute((alias("xmlCopyDoc__internal_alias")));
 #define xmlCopyDoc xmlCopyDoc__internal_alias
 #endif
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlCopyDtd) xmlCopyDtd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyDtd) xmlCopyDtd __attribute((alias("xmlCopyDtd__internal_alias")));
 #define xmlCopyDtd xmlCopyDtd__internal_alias
@@ -1062,17 +1032,23 @@ extern __typeof (xmlCopyElementContent) xmlCopyElementContent__internal_alias __
 extern __typeof (xmlCopyElementContent) xmlCopyElementContent __attribute((alias("xmlCopyElementContent__internal_alias")));
 #define xmlCopyElementContent xmlCopyElementContent__internal_alias
 
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlCopyElementTable) xmlCopyElementTable__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyElementTable) xmlCopyElementTable __attribute((alias("xmlCopyElementTable__internal_alias")));
 #define xmlCopyElementTable xmlCopyElementTable__internal_alias
+#endif
 
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlCopyEntitiesTable) xmlCopyEntitiesTable__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyEntitiesTable) xmlCopyEntitiesTable __attribute((alias("xmlCopyEntitiesTable__internal_alias")));
 #define xmlCopyEntitiesTable xmlCopyEntitiesTable__internal_alias
+#endif
 
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlCopyEnumeration) xmlCopyEnumeration__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyEnumeration) xmlCopyEnumeration __attribute((alias("xmlCopyEnumeration__internal_alias")));
 #define xmlCopyEnumeration xmlCopyEnumeration__internal_alias
+#endif
 
 extern __typeof (xmlCopyError) xmlCopyError__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyError) xmlCopyError __attribute((alias("xmlCopyError__internal_alias")));
@@ -1094,9 +1070,11 @@ extern __typeof (xmlCopyNodeList) xmlCopyNodeList__internal_alias __attribute((v
 extern __typeof (xmlCopyNodeList) xmlCopyNodeList __attribute((alias("xmlCopyNodeList__internal_alias")));
 #define xmlCopyNodeList xmlCopyNodeList__internal_alias
 
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlCopyNotationTable) xmlCopyNotationTable__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyNotationTable) xmlCopyNotationTable __attribute((alias("xmlCopyNotationTable__internal_alias")));
 #define xmlCopyNotationTable xmlCopyNotationTable__internal_alias
+#endif
 
 extern __typeof (xmlCopyProp) xmlCopyProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyProp) xmlCopyProp __attribute((alias("xmlCopyProp__internal_alias")));
@@ -1138,7 +1116,7 @@ extern __typeof (xmlCreateMemoryParserCtxt) xmlCreateMemoryParserCtxt__internal_
 extern __typeof (xmlCreateMemoryParserCtxt) xmlCreateMemoryParserCtxt __attribute((alias("xmlCreateMemoryParserCtxt__internal_alias")));
 #define xmlCreateMemoryParserCtxt xmlCreateMemoryParserCtxt__internal_alias
 
-#ifdef LIBXML_PUSH_ENABLED
+#if defined(LIBXML_PUSH_ENABLED)
 extern __typeof (xmlCreatePushParserCtxt) xmlCreatePushParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCreatePushParserCtxt) xmlCreatePushParserCtxt __attribute((alias("xmlCreatePushParserCtxt__internal_alias")));
 #define xmlCreatePushParserCtxt xmlCreatePushParserCtxt__internal_alias
@@ -1196,75 +1174,77 @@ extern __typeof (xmlCurrentChar) xmlCurrentChar__internal_alias __attribute((vis
 extern __typeof (xmlCurrentChar) xmlCurrentChar __attribute((alias("xmlCurrentChar__internal_alias")));
 #define xmlCurrentChar xmlCurrentChar__internal_alias
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugCheckDocument) xmlDebugCheckDocument__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugCheckDocument) xmlDebugCheckDocument __attribute((alias("xmlDebugCheckDocument__internal_alias")));
 #define xmlDebugCheckDocument xmlDebugCheckDocument__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpAttr) xmlDebugDumpAttr__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpAttr) xmlDebugDumpAttr __attribute((alias("xmlDebugDumpAttr__internal_alias")));
 #define xmlDebugDumpAttr xmlDebugDumpAttr__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpAttrList) xmlDebugDumpAttrList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpAttrList) xmlDebugDumpAttrList __attribute((alias("xmlDebugDumpAttrList__internal_alias")));
 #define xmlDebugDumpAttrList xmlDebugDumpAttrList__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpDTD) xmlDebugDumpDTD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpDTD) xmlDebugDumpDTD __attribute((alias("xmlDebugDumpDTD__internal_alias")));
 #define xmlDebugDumpDTD xmlDebugDumpDTD__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpDocument) xmlDebugDumpDocument__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpDocument) xmlDebugDumpDocument __attribute((alias("xmlDebugDumpDocument__internal_alias")));
 #define xmlDebugDumpDocument xmlDebugDumpDocument__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpDocumentHead) xmlDebugDumpDocumentHead__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpDocumentHead) xmlDebugDumpDocumentHead __attribute((alias("xmlDebugDumpDocumentHead__internal_alias")));
 #define xmlDebugDumpDocumentHead xmlDebugDumpDocumentHead__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpEntities) xmlDebugDumpEntities__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpEntities) xmlDebugDumpEntities __attribute((alias("xmlDebugDumpEntities__internal_alias")));
 #define xmlDebugDumpEntities xmlDebugDumpEntities__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpNode) xmlDebugDumpNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpNode) xmlDebugDumpNode __attribute((alias("xmlDebugDumpNode__internal_alias")));
 #define xmlDebugDumpNode xmlDebugDumpNode__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpNodeList) xmlDebugDumpNodeList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpNodeList) xmlDebugDumpNodeList __attribute((alias("xmlDebugDumpNodeList__internal_alias")));
 #define xmlDebugDumpNodeList xmlDebugDumpNodeList__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpOneNode) xmlDebugDumpOneNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpOneNode) xmlDebugDumpOneNode __attribute((alias("xmlDebugDumpOneNode__internal_alias")));
 #define xmlDebugDumpOneNode xmlDebugDumpOneNode__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlDebugDumpString) xmlDebugDumpString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDebugDumpString) xmlDebugDumpString __attribute((alias("xmlDebugDumpString__internal_alias")));
 #define xmlDebugDumpString xmlDebugDumpString__internal_alias
 #endif
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlDecodeEntities) xmlDecodeEntities__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDecodeEntities) xmlDecodeEntities __attribute((alias("xmlDecodeEntities__internal_alias")));
 #define xmlDecodeEntities xmlDecodeEntities__internal_alias
+#endif
 
 extern __typeof (xmlDefaultSAXHandlerInit) xmlDefaultSAXHandlerInit__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDefaultSAXHandlerInit) xmlDefaultSAXHandlerInit __attribute((alias("xmlDefaultSAXHandlerInit__internal_alias")));
@@ -1290,6 +1270,10 @@ extern __typeof (xmlDictCreateSub) xmlDictCreateSub__internal_alias __attribute(
 extern __typeof (xmlDictCreateSub) xmlDictCreateSub __attribute((alias("xmlDictCreateSub__internal_alias")));
 #define xmlDictCreateSub xmlDictCreateSub__internal_alias
 
+extern __typeof (xmlDictExists) xmlDictExists__internal_alias __attribute((visibility("hidden")));
+extern __typeof (xmlDictExists) xmlDictExists __attribute((alias("xmlDictExists__internal_alias")));
+#define xmlDictExists xmlDictExists__internal_alias
+
 extern __typeof (xmlDictFree) xmlDictFree__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDictFree) xmlDictFree __attribute((alias("xmlDictFree__internal_alias")));
 #define xmlDictFree xmlDictFree__internal_alias
@@ -1322,37 +1306,37 @@ extern __typeof (xmlDocCopyNodeList) xmlDocCopyNodeList__internal_alias __attrib
 extern __typeof (xmlDocCopyNodeList) xmlDocCopyNodeList __attribute((alias("xmlDocCopyNodeList__internal_alias")));
 #define xmlDocCopyNodeList xmlDocCopyNodeList__internal_alias
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDocDump) xmlDocDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDocDump) xmlDocDump __attribute((alias("xmlDocDump__internal_alias")));
 #define xmlDocDump xmlDocDump__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDocDumpFormatMemory) xmlDocDumpFormatMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDocDumpFormatMemory) xmlDocDumpFormatMemory __attribute((alias("xmlDocDumpFormatMemory__internal_alias")));
 #define xmlDocDumpFormatMemory xmlDocDumpFormatMemory__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDocDumpFormatMemoryEnc) xmlDocDumpFormatMemoryEnc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDocDumpFormatMemoryEnc) xmlDocDumpFormatMemoryEnc __attribute((alias("xmlDocDumpFormatMemoryEnc__internal_alias")));
 #define xmlDocDumpFormatMemoryEnc xmlDocDumpFormatMemoryEnc__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDocDumpMemory) xmlDocDumpMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDocDumpMemory) xmlDocDumpMemory __attribute((alias("xmlDocDumpMemory__internal_alias")));
 #define xmlDocDumpMemory xmlDocDumpMemory__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDocDumpMemoryEnc) xmlDocDumpMemoryEnc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDocDumpMemoryEnc) xmlDocDumpMemoryEnc __attribute((alias("xmlDocDumpMemoryEnc__internal_alias")));
 #define xmlDocDumpMemoryEnc xmlDocDumpMemoryEnc__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDocFormatDump) xmlDocFormatDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDocFormatDump) xmlDocFormatDump __attribute((alias("xmlDocFormatDump__internal_alias")));
 #define xmlDocFormatDump xmlDocFormatDump__internal_alias
@@ -1362,69 +1346,71 @@ extern __typeof (xmlDocGetRootElement) xmlDocGetRootElement__internal_alias __at
 extern __typeof (xmlDocGetRootElement) xmlDocGetRootElement __attribute((alias("xmlDocGetRootElement__internal_alias")));
 #define xmlDocGetRootElement xmlDocGetRootElement__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlDocSetRootElement) xmlDocSetRootElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDocSetRootElement) xmlDocSetRootElement __attribute((alias("xmlDocSetRootElement__internal_alias")));
 #define xmlDocSetRootElement xmlDocSetRootElement__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDumpAttributeDecl) xmlDumpAttributeDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDumpAttributeDecl) xmlDumpAttributeDecl __attribute((alias("xmlDumpAttributeDecl__internal_alias")));
 #define xmlDumpAttributeDecl xmlDumpAttributeDecl__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDumpAttributeTable) xmlDumpAttributeTable__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDumpAttributeTable) xmlDumpAttributeTable __attribute((alias("xmlDumpAttributeTable__internal_alias")));
 #define xmlDumpAttributeTable xmlDumpAttributeTable__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDumpElementDecl) xmlDumpElementDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDumpElementDecl) xmlDumpElementDecl __attribute((alias("xmlDumpElementDecl__internal_alias")));
 #define xmlDumpElementDecl xmlDumpElementDecl__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDumpElementTable) xmlDumpElementTable__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDumpElementTable) xmlDumpElementTable __attribute((alias("xmlDumpElementTable__internal_alias")));
 #define xmlDumpElementTable xmlDumpElementTable__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDumpEntitiesTable) xmlDumpEntitiesTable__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDumpEntitiesTable) xmlDumpEntitiesTable __attribute((alias("xmlDumpEntitiesTable__internal_alias")));
 #define xmlDumpEntitiesTable xmlDumpEntitiesTable__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDumpEntityDecl) xmlDumpEntityDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDumpEntityDecl) xmlDumpEntityDecl __attribute((alias("xmlDumpEntityDecl__internal_alias")));
 #define xmlDumpEntityDecl xmlDumpEntityDecl__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDumpNotationDecl) xmlDumpNotationDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDumpNotationDecl) xmlDumpNotationDecl __attribute((alias("xmlDumpNotationDecl__internal_alias")));
 #define xmlDumpNotationDecl xmlDumpNotationDecl__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlDumpNotationTable) xmlDumpNotationTable__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDumpNotationTable) xmlDumpNotationTable __attribute((alias("xmlDumpNotationTable__internal_alias")));
 #define xmlDumpNotationTable xmlDumpNotationTable__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlElemDump) xmlElemDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlElemDump) xmlElemDump __attribute((alias("xmlElemDump__internal_alias")));
 #define xmlElemDump xmlElemDump__internal_alias
 #endif
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlEncodeEntities) xmlEncodeEntities__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlEncodeEntities) xmlEncodeEntities __attribute((alias("xmlEncodeEntities__internal_alias")));
 #define xmlEncodeEntities xmlEncodeEntities__internal_alias
+#endif
 
 extern __typeof (xmlEncodeEntitiesReentrant) xmlEncodeEntitiesReentrant__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlEncodeEntitiesReentrant) xmlEncodeEntitiesReentrant __attribute((alias("xmlEncodeEntitiesReentrant__internal_alias")));
@@ -1434,9 +1420,11 @@ extern __typeof (xmlEncodeSpecialChars) xmlEncodeSpecialChars__internal_alias __
 extern __typeof (xmlEncodeSpecialChars) xmlEncodeSpecialChars __attribute((alias("xmlEncodeSpecialChars__internal_alias")));
 #define xmlEncodeSpecialChars xmlEncodeSpecialChars__internal_alias
 
+#if defined(IN_LIBXML)
 extern __typeof (xmlErrMemory) xmlErrMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlErrMemory) xmlErrMemory __attribute((alias("xmlErrMemory__internal_alias")));
 #define xmlErrMemory xmlErrMemory__internal_alias
+#endif
 
 extern __typeof (xmlFileClose) xmlFileClose__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlFileClose) xmlFileClose __attribute((alias("xmlFileClose__internal_alias")));
@@ -1462,13 +1450,13 @@ extern __typeof (xmlFreeAttributeTable) xmlFreeAttributeTable__internal_alias __
 extern __typeof (xmlFreeAttributeTable) xmlFreeAttributeTable __attribute((alias("xmlFreeAttributeTable__internal_alias")));
 #define xmlFreeAttributeTable xmlFreeAttributeTable__internal_alias
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlFreeAutomata) xmlFreeAutomata__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlFreeAutomata) xmlFreeAutomata __attribute((alias("xmlFreeAutomata__internal_alias")));
 #define xmlFreeAutomata xmlFreeAutomata__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlFreeCatalog) xmlFreeCatalog__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlFreeCatalog) xmlFreeCatalog __attribute((alias("xmlFreeCatalog__internal_alias")));
 #define xmlFreeCatalog xmlFreeCatalog__internal_alias
@@ -1538,13 +1526,13 @@ extern __typeof (xmlFreeParserInputBuffer) xmlFreeParserInputBuffer__internal_al
 extern __typeof (xmlFreeParserInputBuffer) xmlFreeParserInputBuffer __attribute((alias("xmlFreeParserInputBuffer__internal_alias")));
 #define xmlFreeParserInputBuffer xmlFreeParserInputBuffer__internal_alias
 
-#ifdef LIBXML_PATTERN_ENABLED
+#if defined(LIBXML_PATTERN_ENABLED)
 extern __typeof (xmlFreePattern) xmlFreePattern__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlFreePattern) xmlFreePattern __attribute((alias("xmlFreePattern__internal_alias")));
 #define xmlFreePattern xmlFreePattern__internal_alias
 #endif
 
-#ifdef LIBXML_PATTERN_ENABLED
+#if defined(LIBXML_PATTERN_ENABLED)
 extern __typeof (xmlFreePatternList) xmlFreePatternList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlFreePatternList) xmlFreePatternList __attribute((alias("xmlFreePatternList__internal_alias")));
 #define xmlFreePatternList xmlFreePatternList__internal_alias
@@ -1566,13 +1554,13 @@ extern __typeof (xmlFreeRefTable) xmlFreeRefTable__internal_alias __attribute((v
 extern __typeof (xmlFreeRefTable) xmlFreeRefTable __attribute((alias("xmlFreeRefTable__internal_alias")));
 #define xmlFreeRefTable xmlFreeRefTable__internal_alias
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlFreeTextReader) xmlFreeTextReader__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlFreeTextReader) xmlFreeTextReader __attribute((alias("xmlFreeTextReader__internal_alias")));
 #define xmlFreeTextReader xmlFreeTextReader__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlFreeTextWriter) xmlFreeTextWriter__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlFreeTextWriter) xmlFreeTextWriter __attribute((alias("xmlFreeTextWriter__internal_alias")));
 #define xmlFreeTextWriter xmlFreeTextWriter__internal_alias
@@ -1582,9 +1570,11 @@ extern __typeof (xmlFreeURI) xmlFreeURI__internal_alias __attribute((visibility(
 extern __typeof (xmlFreeURI) xmlFreeURI __attribute((alias("xmlFreeURI__internal_alias")));
 #define xmlFreeURI xmlFreeURI__internal_alias
 
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlFreeValidCtxt) xmlFreeValidCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlFreeValidCtxt) xmlFreeValidCtxt __attribute((alias("xmlFreeValidCtxt__internal_alias")));
 #define xmlFreeValidCtxt xmlFreeValidCtxt__internal_alias
+#endif
 
 extern __typeof (xmlGcMemGet) xmlGcMemGet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlGcMemGet) xmlGcMemGet __attribute((alias("xmlGcMemGet__internal_alias")));
@@ -1650,13 +1640,17 @@ extern __typeof (xmlGetExternalEntityLoader) xmlGetExternalEntityLoader__interna
 extern __typeof (xmlGetExternalEntityLoader) xmlGetExternalEntityLoader __attribute((alias("xmlGetExternalEntityLoader__internal_alias")));
 #define xmlGetExternalEntityLoader xmlGetExternalEntityLoader__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlGetFeature) xmlGetFeature__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlGetFeature) xmlGetFeature __attribute((alias("xmlGetFeature__internal_alias")));
 #define xmlGetFeature xmlGetFeature__internal_alias
+#endif
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlGetFeaturesList) xmlGetFeaturesList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlGetFeaturesList) xmlGetFeaturesList __attribute((alias("xmlGetFeaturesList__internal_alias")));
 #define xmlGetFeaturesList xmlGetFeaturesList__internal_alias
+#endif
 
 extern __typeof (xmlGetGlobalState) xmlGetGlobalState__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlGetGlobalState) xmlGetGlobalState __attribute((alias("xmlGetGlobalState__internal_alias")));
@@ -1686,13 +1680,13 @@ extern __typeof (xmlGetNoNsProp) xmlGetNoNsProp__internal_alias __attribute((vis
 extern __typeof (xmlGetNoNsProp) xmlGetNoNsProp __attribute((alias("xmlGetNoNsProp__internal_alias")));
 #define xmlGetNoNsProp xmlGetNoNsProp__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlGetNodePath) xmlGetNodePath__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlGetNodePath) xmlGetNodePath __attribute((alias("xmlGetNodePath__internal_alias")));
 #define xmlGetNodePath xmlGetNodePath__internal_alias
 #endif
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlGetNsList) xmlGetNsList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlGetNsList) xmlGetNsList __attribute((alias("xmlGetNsList__internal_alias")));
 #define xmlGetNsList xmlGetNsList__internal_alias
@@ -1726,9 +1720,11 @@ extern __typeof (xmlGetUTF8Char) xmlGetUTF8Char__internal_alias __attribute((vis
 extern __typeof (xmlGetUTF8Char) xmlGetUTF8Char __attribute((alias("xmlGetUTF8Char__internal_alias")));
 #define xmlGetUTF8Char xmlGetUTF8Char__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlHandleEntity) xmlHandleEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlHandleEntity) xmlHandleEntity __attribute((alias("xmlHandleEntity__internal_alias")));
 #define xmlHandleEntity xmlHandleEntity__internal_alias
+#endif
 
 extern __typeof (xmlHasNsProp) xmlHasNsProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlHasNsProp) xmlHasNsProp __attribute((alias("xmlHasNsProp__internal_alias")));
@@ -1830,63 +1826,65 @@ extern __typeof (xmlHashUpdateEntry3) xmlHashUpdateEntry3__internal_alias __attr
 extern __typeof (xmlHashUpdateEntry3) xmlHashUpdateEntry3 __attribute((alias("xmlHashUpdateEntry3__internal_alias")));
 #define xmlHashUpdateEntry3 xmlHashUpdateEntry3__internal_alias
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlIOFTPClose) xmlIOFTPClose__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOFTPClose) xmlIOFTPClose __attribute((alias("xmlIOFTPClose__internal_alias")));
 #define xmlIOFTPClose xmlIOFTPClose__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlIOFTPMatch) xmlIOFTPMatch__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOFTPMatch) xmlIOFTPMatch __attribute((alias("xmlIOFTPMatch__internal_alias")));
 #define xmlIOFTPMatch xmlIOFTPMatch__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlIOFTPOpen) xmlIOFTPOpen__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOFTPOpen) xmlIOFTPOpen __attribute((alias("xmlIOFTPOpen__internal_alias")));
 #define xmlIOFTPOpen xmlIOFTPOpen__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlIOFTPRead) xmlIOFTPRead__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOFTPRead) xmlIOFTPRead __attribute((alias("xmlIOFTPRead__internal_alias")));
 #define xmlIOFTPRead xmlIOFTPRead__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlIOHTTPClose) xmlIOHTTPClose__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOHTTPClose) xmlIOHTTPClose __attribute((alias("xmlIOHTTPClose__internal_alias")));
 #define xmlIOHTTPClose xmlIOHTTPClose__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlIOHTTPMatch) xmlIOHTTPMatch__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOHTTPMatch) xmlIOHTTPMatch __attribute((alias("xmlIOHTTPMatch__internal_alias")));
 #define xmlIOHTTPMatch xmlIOHTTPMatch__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlIOHTTPOpen) xmlIOHTTPOpen__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOHTTPOpen) xmlIOHTTPOpen __attribute((alias("xmlIOHTTPOpen__internal_alias")));
 #define xmlIOHTTPOpen xmlIOHTTPOpen__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlIOHTTPOpenW) xmlIOHTTPOpenW__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOHTTPOpenW) xmlIOHTTPOpenW __attribute((alias("xmlIOHTTPOpenW__internal_alias")));
 #define xmlIOHTTPOpenW xmlIOHTTPOpenW__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlIOHTTPRead) xmlIOHTTPRead__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOHTTPRead) xmlIOHTTPRead __attribute((alias("xmlIOHTTPRead__internal_alias")));
 #define xmlIOHTTPRead xmlIOHTTPRead__internal_alias
 #endif
 
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlIOParseDTD) xmlIOParseDTD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIOParseDTD) xmlIOParseDTD __attribute((alias("xmlIOParseDTD__internal_alias")));
 #define xmlIOParseDTD xmlIOParseDTD__internal_alias
+#endif
 
 extern __typeof (xmlInitCharEncodingHandlers) xmlInitCharEncodingHandlers__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlInitCharEncodingHandlers) xmlInitCharEncodingHandlers __attribute((alias("xmlInitCharEncodingHandlers__internal_alias")));
@@ -1916,7 +1914,7 @@ extern __typeof (xmlInitThreads) xmlInitThreads__internal_alias __attribute((vis
 extern __typeof (xmlInitThreads) xmlInitThreads __attribute((alias("xmlInitThreads__internal_alias")));
 #define xmlInitThreads xmlInitThreads__internal_alias
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlInitializeCatalog) xmlInitializeCatalog__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlInitializeCatalog) xmlInitializeCatalog __attribute((alias("xmlInitializeCatalog__internal_alias")));
 #define xmlInitializeCatalog xmlInitializeCatalog__internal_alias
@@ -1926,9 +1924,11 @@ extern __typeof (xmlInitializeGlobalState) xmlInitializeGlobalState__internal_al
 extern __typeof (xmlInitializeGlobalState) xmlInitializeGlobalState __attribute((alias("xmlInitializeGlobalState__internal_alias")));
 #define xmlInitializeGlobalState xmlInitializeGlobalState__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlInitializePredefinedEntities) xmlInitializePredefinedEntities__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlInitializePredefinedEntities) xmlInitializePredefinedEntities __attribute((alias("xmlInitializePredefinedEntities__internal_alias")));
 #define xmlInitializePredefinedEntities xmlInitializePredefinedEntities__internal_alias
+#endif
 
 extern __typeof (xmlIsBaseChar) xmlIsBaseChar__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlIsBaseChar) xmlIsBaseChar __attribute((alias("xmlIsBaseChar__internal_alias")));
@@ -2102,19 +2102,19 @@ extern __typeof (xmlListWalk) xmlListWalk__internal_alias __attribute((visibilit
 extern __typeof (xmlListWalk) xmlListWalk __attribute((alias("xmlListWalk__internal_alias")));
 #define xmlListWalk xmlListWalk__internal_alias
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlLoadACatalog) xmlLoadACatalog__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlLoadACatalog) xmlLoadACatalog __attribute((alias("xmlLoadACatalog__internal_alias")));
 #define xmlLoadACatalog xmlLoadACatalog__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlLoadCatalog) xmlLoadCatalog__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlLoadCatalog) xmlLoadCatalog __attribute((alias("xmlLoadCatalog__internal_alias")));
 #define xmlLoadCatalog xmlLoadCatalog__internal_alias
 #endif
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlLoadCatalogs) xmlLoadCatalogs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlLoadCatalogs) xmlLoadCatalogs __attribute((alias("xmlLoadCatalogs__internal_alias")));
 #define xmlLoadCatalogs xmlLoadCatalogs__internal_alias
@@ -2124,7 +2124,7 @@ extern __typeof (xmlLoadExternalEntity) xmlLoadExternalEntity__internal_alias __
 extern __typeof (xmlLoadExternalEntity) xmlLoadExternalEntity __attribute((alias("xmlLoadExternalEntity__internal_alias")));
 #define xmlLoadExternalEntity xmlLoadExternalEntity__internal_alias
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlLoadSGMLSuperCatalog) xmlLoadSGMLSuperCatalog__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlLoadSGMLSuperCatalog) xmlLoadSGMLSuperCatalog __attribute((alias("xmlLoadSGMLSuperCatalog__internal_alias")));
 #define xmlLoadSGMLSuperCatalog xmlLoadSGMLSuperCatalog__internal_alias
@@ -2134,13 +2134,13 @@ extern __typeof (xmlLockLibrary) xmlLockLibrary__internal_alias __attribute((vis
 extern __typeof (xmlLockLibrary) xmlLockLibrary __attribute((alias("xmlLockLibrary__internal_alias")));
 #define xmlLockLibrary xmlLockLibrary__internal_alias
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlLsCountNode) xmlLsCountNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlLsCountNode) xmlLsCountNode __attribute((alias("xmlLsCountNode__internal_alias")));
 #define xmlLsCountNode xmlLsCountNode__internal_alias
 #endif
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlLsOneNode) xmlLsOneNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlLsOneNode) xmlLsOneNode __attribute((alias("xmlLsOneNode__internal_alias")));
 #define xmlLsOneNode xmlLsOneNode__internal_alias
@@ -2210,255 +2210,259 @@ extern __typeof (xmlMutexUnlock) xmlMutexUnlock__internal_alias __attribute((vis
 extern __typeof (xmlMutexUnlock) xmlMutexUnlock __attribute((alias("xmlMutexUnlock__internal_alias")));
 #define xmlMutexUnlock xmlMutexUnlock__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlNamespaceParseNCName) xmlNamespaceParseNCName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNamespaceParseNCName) xmlNamespaceParseNCName __attribute((alias("xmlNamespaceParseNCName__internal_alias")));
 #define xmlNamespaceParseNCName xmlNamespaceParseNCName__internal_alias
+#endif
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlNamespaceParseNSDef) xmlNamespaceParseNSDef__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNamespaceParseNSDef) xmlNamespaceParseNSDef __attribute((alias("xmlNamespaceParseNSDef__internal_alias")));
 #define xmlNamespaceParseNSDef xmlNamespaceParseNSDef__internal_alias
+#endif
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlNamespaceParseQName) xmlNamespaceParseQName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNamespaceParseQName) xmlNamespaceParseQName __attribute((alias("xmlNamespaceParseQName__internal_alias")));
 #define xmlNamespaceParseQName xmlNamespaceParseQName__internal_alias
+#endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPCheckResponse) xmlNanoFTPCheckResponse__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPCheckResponse) xmlNanoFTPCheckResponse __attribute((alias("xmlNanoFTPCheckResponse__internal_alias")));
 #define xmlNanoFTPCheckResponse xmlNanoFTPCheckResponse__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPCleanup) xmlNanoFTPCleanup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPCleanup) xmlNanoFTPCleanup __attribute((alias("xmlNanoFTPCleanup__internal_alias")));
 #define xmlNanoFTPCleanup xmlNanoFTPCleanup__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPClose) xmlNanoFTPClose__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPClose) xmlNanoFTPClose __attribute((alias("xmlNanoFTPClose__internal_alias")));
 #define xmlNanoFTPClose xmlNanoFTPClose__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPCloseConnection) xmlNanoFTPCloseConnection__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPCloseConnection) xmlNanoFTPCloseConnection __attribute((alias("xmlNanoFTPCloseConnection__internal_alias")));
 #define xmlNanoFTPCloseConnection xmlNanoFTPCloseConnection__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPConnect) xmlNanoFTPConnect__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPConnect) xmlNanoFTPConnect __attribute((alias("xmlNanoFTPConnect__internal_alias")));
 #define xmlNanoFTPConnect xmlNanoFTPConnect__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPConnectTo) xmlNanoFTPConnectTo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPConnectTo) xmlNanoFTPConnectTo __attribute((alias("xmlNanoFTPConnectTo__internal_alias")));
 #define xmlNanoFTPConnectTo xmlNanoFTPConnectTo__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPCwd) xmlNanoFTPCwd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPCwd) xmlNanoFTPCwd __attribute((alias("xmlNanoFTPCwd__internal_alias")));
 #define xmlNanoFTPCwd xmlNanoFTPCwd__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPDele) xmlNanoFTPDele__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPDele) xmlNanoFTPDele __attribute((alias("xmlNanoFTPDele__internal_alias")));
 #define xmlNanoFTPDele xmlNanoFTPDele__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPFreeCtxt) xmlNanoFTPFreeCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPFreeCtxt) xmlNanoFTPFreeCtxt __attribute((alias("xmlNanoFTPFreeCtxt__internal_alias")));
 #define xmlNanoFTPFreeCtxt xmlNanoFTPFreeCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPGet) xmlNanoFTPGet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPGet) xmlNanoFTPGet __attribute((alias("xmlNanoFTPGet__internal_alias")));
 #define xmlNanoFTPGet xmlNanoFTPGet__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPGetConnection) xmlNanoFTPGetConnection__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPGetConnection) xmlNanoFTPGetConnection __attribute((alias("xmlNanoFTPGetConnection__internal_alias")));
 #define xmlNanoFTPGetConnection xmlNanoFTPGetConnection__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPGetResponse) xmlNanoFTPGetResponse__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPGetResponse) xmlNanoFTPGetResponse __attribute((alias("xmlNanoFTPGetResponse__internal_alias")));
 #define xmlNanoFTPGetResponse xmlNanoFTPGetResponse__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPGetSocket) xmlNanoFTPGetSocket__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPGetSocket) xmlNanoFTPGetSocket __attribute((alias("xmlNanoFTPGetSocket__internal_alias")));
 #define xmlNanoFTPGetSocket xmlNanoFTPGetSocket__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPInit) xmlNanoFTPInit__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPInit) xmlNanoFTPInit __attribute((alias("xmlNanoFTPInit__internal_alias")));
 #define xmlNanoFTPInit xmlNanoFTPInit__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPList) xmlNanoFTPList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPList) xmlNanoFTPList __attribute((alias("xmlNanoFTPList__internal_alias")));
 #define xmlNanoFTPList xmlNanoFTPList__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPNewCtxt) xmlNanoFTPNewCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPNewCtxt) xmlNanoFTPNewCtxt __attribute((alias("xmlNanoFTPNewCtxt__internal_alias")));
 #define xmlNanoFTPNewCtxt xmlNanoFTPNewCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPOpen) xmlNanoFTPOpen__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPOpen) xmlNanoFTPOpen __attribute((alias("xmlNanoFTPOpen__internal_alias")));
 #define xmlNanoFTPOpen xmlNanoFTPOpen__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPProxy) xmlNanoFTPProxy__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPProxy) xmlNanoFTPProxy __attribute((alias("xmlNanoFTPProxy__internal_alias")));
 #define xmlNanoFTPProxy xmlNanoFTPProxy__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPQuit) xmlNanoFTPQuit__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPQuit) xmlNanoFTPQuit __attribute((alias("xmlNanoFTPQuit__internal_alias")));
 #define xmlNanoFTPQuit xmlNanoFTPQuit__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPRead) xmlNanoFTPRead__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPRead) xmlNanoFTPRead __attribute((alias("xmlNanoFTPRead__internal_alias")));
 #define xmlNanoFTPRead xmlNanoFTPRead__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPScanProxy) xmlNanoFTPScanProxy__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPScanProxy) xmlNanoFTPScanProxy __attribute((alias("xmlNanoFTPScanProxy__internal_alias")));
 #define xmlNanoFTPScanProxy xmlNanoFTPScanProxy__internal_alias
 #endif
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
 extern __typeof (xmlNanoFTPUpdateURL) xmlNanoFTPUpdateURL__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoFTPUpdateURL) xmlNanoFTPUpdateURL __attribute((alias("xmlNanoFTPUpdateURL__internal_alias")));
 #define xmlNanoFTPUpdateURL xmlNanoFTPUpdateURL__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPAuthHeader) xmlNanoHTTPAuthHeader__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPAuthHeader) xmlNanoHTTPAuthHeader __attribute((alias("xmlNanoHTTPAuthHeader__internal_alias")));
 #define xmlNanoHTTPAuthHeader xmlNanoHTTPAuthHeader__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPCleanup) xmlNanoHTTPCleanup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPCleanup) xmlNanoHTTPCleanup __attribute((alias("xmlNanoHTTPCleanup__internal_alias")));
 #define xmlNanoHTTPCleanup xmlNanoHTTPCleanup__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPClose) xmlNanoHTTPClose__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPClose) xmlNanoHTTPClose __attribute((alias("xmlNanoHTTPClose__internal_alias")));
 #define xmlNanoHTTPClose xmlNanoHTTPClose__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPContentLength) xmlNanoHTTPContentLength__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPContentLength) xmlNanoHTTPContentLength __attribute((alias("xmlNanoHTTPContentLength__internal_alias")));
 #define xmlNanoHTTPContentLength xmlNanoHTTPContentLength__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPEncoding) xmlNanoHTTPEncoding__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPEncoding) xmlNanoHTTPEncoding __attribute((alias("xmlNanoHTTPEncoding__internal_alias")));
 #define xmlNanoHTTPEncoding xmlNanoHTTPEncoding__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPFetch) xmlNanoHTTPFetch__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPFetch) xmlNanoHTTPFetch __attribute((alias("xmlNanoHTTPFetch__internal_alias")));
 #define xmlNanoHTTPFetch xmlNanoHTTPFetch__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPInit) xmlNanoHTTPInit__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPInit) xmlNanoHTTPInit __attribute((alias("xmlNanoHTTPInit__internal_alias")));
 #define xmlNanoHTTPInit xmlNanoHTTPInit__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPMethod) xmlNanoHTTPMethod__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPMethod) xmlNanoHTTPMethod __attribute((alias("xmlNanoHTTPMethod__internal_alias")));
 #define xmlNanoHTTPMethod xmlNanoHTTPMethod__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPMethodRedir) xmlNanoHTTPMethodRedir__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPMethodRedir) xmlNanoHTTPMethodRedir __attribute((alias("xmlNanoHTTPMethodRedir__internal_alias")));
 #define xmlNanoHTTPMethodRedir xmlNanoHTTPMethodRedir__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPMimeType) xmlNanoHTTPMimeType__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPMimeType) xmlNanoHTTPMimeType __attribute((alias("xmlNanoHTTPMimeType__internal_alias")));
 #define xmlNanoHTTPMimeType xmlNanoHTTPMimeType__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPOpen) xmlNanoHTTPOpen__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPOpen) xmlNanoHTTPOpen __attribute((alias("xmlNanoHTTPOpen__internal_alias")));
 #define xmlNanoHTTPOpen xmlNanoHTTPOpen__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPOpenRedir) xmlNanoHTTPOpenRedir__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPOpenRedir) xmlNanoHTTPOpenRedir __attribute((alias("xmlNanoHTTPOpenRedir__internal_alias")));
 #define xmlNanoHTTPOpenRedir xmlNanoHTTPOpenRedir__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPRead) xmlNanoHTTPRead__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPRead) xmlNanoHTTPRead __attribute((alias("xmlNanoHTTPRead__internal_alias")));
 #define xmlNanoHTTPRead xmlNanoHTTPRead__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPRedir) xmlNanoHTTPRedir__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPRedir) xmlNanoHTTPRedir __attribute((alias("xmlNanoHTTPRedir__internal_alias")));
 #define xmlNanoHTTPRedir xmlNanoHTTPRedir__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPReturnCode) xmlNanoHTTPReturnCode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPReturnCode) xmlNanoHTTPReturnCode __attribute((alias("xmlNanoHTTPReturnCode__internal_alias")));
 #define xmlNanoHTTPReturnCode xmlNanoHTTPReturnCode__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTTP_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlNanoHTTPSave) xmlNanoHTTPSave__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPSave) xmlNanoHTTPSave __attribute((alias("xmlNanoHTTPSave__internal_alias")));
 #define xmlNanoHTTPSave xmlNanoHTTPSave__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlNanoHTTPScanProxy) xmlNanoHTTPScanProxy__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNanoHTTPScanProxy) xmlNanoHTTPScanProxy __attribute((alias("xmlNanoHTTPScanProxy__internal_alias")));
 #define xmlNanoHTTPScanProxy xmlNanoHTTPScanProxy__internal_alias
 #endif
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
 extern __typeof (xmlNewAutomata) xmlNewAutomata__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewAutomata) xmlNewAutomata __attribute((alias("xmlNewAutomata__internal_alias")));
 #define xmlNewAutomata xmlNewAutomata__internal_alias
@@ -2468,7 +2472,7 @@ extern __typeof (xmlNewCDataBlock) xmlNewCDataBlock__internal_alias __attribute(
 extern __typeof (xmlNewCDataBlock) xmlNewCDataBlock __attribute((alias("xmlNewCDataBlock__internal_alias")));
 #define xmlNewCDataBlock xmlNewCDataBlock__internal_alias
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlNewCatalog) xmlNewCatalog__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewCatalog) xmlNewCatalog __attribute((alias("xmlNewCatalog__internal_alias")));
 #define xmlNewCatalog xmlNewCatalog__internal_alias
@@ -2482,9 +2486,11 @@ extern __typeof (xmlNewCharRef) xmlNewCharRef__internal_alias __attribute((visib
 extern __typeof (xmlNewCharRef) xmlNewCharRef __attribute((alias("xmlNewCharRef__internal_alias")));
 #define xmlNewCharRef xmlNewCharRef__internal_alias
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlNewChild) xmlNewChild__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewChild) xmlNewChild __attribute((alias("xmlNewChild__internal_alias")));
 #define xmlNewChild xmlNewChild__internal_alias
+#endif
 
 extern __typeof (xmlNewComment) xmlNewComment__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewComment) xmlNewComment __attribute((alias("xmlNewComment__internal_alias")));
@@ -2498,7 +2504,7 @@ extern __typeof (xmlNewDocComment) xmlNewDocComment__internal_alias __attribute(
 extern __typeof (xmlNewDocComment) xmlNewDocComment __attribute((alias("xmlNewDocComment__internal_alias")));
 #define xmlNewDocComment xmlNewDocComment__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlNewDocFragment) xmlNewDocFragment__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewDocFragment) xmlNewDocFragment __attribute((alias("xmlNewDocFragment__internal_alias")));
 #define xmlNewDocFragment xmlNewDocFragment__internal_alias
@@ -2520,9 +2526,11 @@ extern __typeof (xmlNewDocProp) xmlNewDocProp__internal_alias __attribute((visib
 extern __typeof (xmlNewDocProp) xmlNewDocProp __attribute((alias("xmlNewDocProp__internal_alias")));
 #define xmlNewDocProp xmlNewDocProp__internal_alias
 
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlNewDocRawNode) xmlNewDocRawNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewDocRawNode) xmlNewDocRawNode __attribute((alias("xmlNewDocRawNode__internal_alias")));
 #define xmlNewDocRawNode xmlNewDocRawNode__internal_alias
+#endif
 
 extern __typeof (xmlNewDocText) xmlNewDocText__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewDocText) xmlNewDocText __attribute((alias("xmlNewDocText__internal_alias")));
@@ -2544,9 +2552,11 @@ extern __typeof (xmlNewEntityInputStream) xmlNewEntityInputStream__internal_alia
 extern __typeof (xmlNewEntityInputStream) xmlNewEntityInputStream __attribute((alias("xmlNewEntityInputStream__internal_alias")));
 #define xmlNewEntityInputStream xmlNewEntityInputStream__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlNewGlobalNs) xmlNewGlobalNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewGlobalNs) xmlNewGlobalNs __attribute((alias("xmlNewGlobalNs__internal_alias")));
 #define xmlNewGlobalNs xmlNewGlobalNs__internal_alias
+#endif
 
 extern __typeof (xmlNewIOInputStream) xmlNewIOInputStream__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewIOInputStream) xmlNewIOInputStream __attribute((alias("xmlNewIOInputStream__internal_alias")));
@@ -2592,9 +2602,11 @@ extern __typeof (xmlNewParserCtxt) xmlNewParserCtxt__internal_alias __attribute(
 extern __typeof (xmlNewParserCtxt) xmlNewParserCtxt __attribute((alias("xmlNewParserCtxt__internal_alias")));
 #define xmlNewParserCtxt xmlNewParserCtxt__internal_alias
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlNewProp) xmlNewProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewProp) xmlNewProp __attribute((alias("xmlNewProp__internal_alias")));
 #define xmlNewProp xmlNewProp__internal_alias
+#endif
 
 extern __typeof (xmlNewRMutex) xmlNewRMutex__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewRMutex) xmlNewRMutex __attribute((alias("xmlNewRMutex__internal_alias")));
@@ -2612,65 +2624,69 @@ extern __typeof (xmlNewText) xmlNewText__internal_alias __attribute((visibility(
 extern __typeof (xmlNewText) xmlNewText __attribute((alias("xmlNewText__internal_alias")));
 #define xmlNewText xmlNewText__internal_alias
 
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlNewTextChild) xmlNewTextChild__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextChild) xmlNewTextChild __attribute((alias("xmlNewTextChild__internal_alias")));
 #define xmlNewTextChild xmlNewTextChild__internal_alias
+#endif
 
 extern __typeof (xmlNewTextLen) xmlNewTextLen__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextLen) xmlNewTextLen __attribute((alias("xmlNewTextLen__internal_alias")));
 #define xmlNewTextLen xmlNewTextLen__internal_alias
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlNewTextReader) xmlNewTextReader__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextReader) xmlNewTextReader __attribute((alias("xmlNewTextReader__internal_alias")));
 #define xmlNewTextReader xmlNewTextReader__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlNewTextReaderFilename) xmlNewTextReaderFilename__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextReaderFilename) xmlNewTextReaderFilename __attribute((alias("xmlNewTextReaderFilename__internal_alias")));
 #define xmlNewTextReaderFilename xmlNewTextReaderFilename__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlNewTextWriter) xmlNewTextWriter__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextWriter) xmlNewTextWriter __attribute((alias("xmlNewTextWriter__internal_alias")));
 #define xmlNewTextWriter xmlNewTextWriter__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlNewTextWriterDoc) xmlNewTextWriterDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextWriterDoc) xmlNewTextWriterDoc __attribute((alias("xmlNewTextWriterDoc__internal_alias")));
 #define xmlNewTextWriterDoc xmlNewTextWriterDoc__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlNewTextWriterFilename) xmlNewTextWriterFilename__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextWriterFilename) xmlNewTextWriterFilename __attribute((alias("xmlNewTextWriterFilename__internal_alias")));
 #define xmlNewTextWriterFilename xmlNewTextWriterFilename__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlNewTextWriterMemory) xmlNewTextWriterMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextWriterMemory) xmlNewTextWriterMemory __attribute((alias("xmlNewTextWriterMemory__internal_alias")));
 #define xmlNewTextWriterMemory xmlNewTextWriterMemory__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlNewTextWriterPushParser) xmlNewTextWriterPushParser__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextWriterPushParser) xmlNewTextWriterPushParser __attribute((alias("xmlNewTextWriterPushParser__internal_alias")));
 #define xmlNewTextWriterPushParser xmlNewTextWriterPushParser__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlNewTextWriterTree) xmlNewTextWriterTree__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewTextWriterTree) xmlNewTextWriterTree __attribute((alias("xmlNewTextWriterTree__internal_alias")));
 #define xmlNewTextWriterTree xmlNewTextWriterTree__internal_alias
 #endif
 
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlNewValidCtxt) xmlNewValidCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewValidCtxt) xmlNewValidCtxt __attribute((alias("xmlNewValidCtxt__internal_alias")));
 #define xmlNewValidCtxt xmlNewValidCtxt__internal_alias
+#endif
 
 extern __typeof (xmlNextChar) xmlNextChar__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNextChar) xmlNextChar __attribute((alias("xmlNextChar__internal_alias")));
@@ -2692,13 +2708,13 @@ extern __typeof (xmlNodeBufGetContent) xmlNodeBufGetContent__internal_alias __at
 extern __typeof (xmlNodeBufGetContent) xmlNodeBufGetContent __attribute((alias("xmlNodeBufGetContent__internal_alias")));
 #define xmlNodeBufGetContent xmlNodeBufGetContent__internal_alias
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlNodeDump) xmlNodeDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNodeDump) xmlNodeDump __attribute((alias("xmlNodeDump__internal_alias")));
 #define xmlNodeDump xmlNodeDump__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlNodeDumpOutput) xmlNodeDumpOutput__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNodeDumpOutput) xmlNodeDumpOutput __attribute((alias("xmlNodeDumpOutput__internal_alias")));
 #define xmlNodeDumpOutput xmlNodeDumpOutput__internal_alias
@@ -2724,7 +2740,7 @@ extern __typeof (xmlNodeIsText) xmlNodeIsText__internal_alias __attribute((visib
 extern __typeof (xmlNodeIsText) xmlNodeIsText __attribute((alias("xmlNodeIsText__internal_alias")));
 #define xmlNodeIsText xmlNodeIsText__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlNodeListGetRawString) xmlNodeListGetRawString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNodeListGetRawString) xmlNodeListGetRawString __attribute((alias("xmlNodeListGetRawString__internal_alias")));
 #define xmlNodeListGetRawString xmlNodeListGetRawString__internal_alias
@@ -2734,7 +2750,7 @@ extern __typeof (xmlNodeListGetString) xmlNodeListGetString__internal_alias __at
 extern __typeof (xmlNodeListGetString) xmlNodeListGetString __attribute((alias("xmlNodeListGetString__internal_alias")));
 #define xmlNodeListGetString xmlNodeListGetString__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED)
 extern __typeof (xmlNodeSetBase) xmlNodeSetBase__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNodeSetBase) xmlNodeSetBase __attribute((alias("xmlNodeSetBase__internal_alias")));
 #define xmlNodeSetBase xmlNodeSetBase__internal_alias
@@ -2744,25 +2760,25 @@ extern __typeof (xmlNodeSetContent) xmlNodeSetContent__internal_alias __attribut
 extern __typeof (xmlNodeSetContent) xmlNodeSetContent __attribute((alias("xmlNodeSetContent__internal_alias")));
 #define xmlNodeSetContent xmlNodeSetContent__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlNodeSetContentLen) xmlNodeSetContentLen__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNodeSetContentLen) xmlNodeSetContentLen __attribute((alias("xmlNodeSetContentLen__internal_alias")));
 #define xmlNodeSetContentLen xmlNodeSetContentLen__internal_alias
 #endif
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlNodeSetLang) xmlNodeSetLang__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNodeSetLang) xmlNodeSetLang __attribute((alias("xmlNodeSetLang__internal_alias")));
 #define xmlNodeSetLang xmlNodeSetLang__internal_alias
 #endif
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlNodeSetName) xmlNodeSetName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNodeSetName) xmlNodeSetName __attribute((alias("xmlNodeSetName__internal_alias")));
 #define xmlNodeSetName xmlNodeSetName__internal_alias
 #endif
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlNodeSetSpacePreserve) xmlNodeSetSpacePreserve__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNodeSetSpacePreserve) xmlNodeSetSpacePreserve __attribute((alias("xmlNodeSetSpacePreserve__internal_alias")));
 #define xmlNodeSetSpacePreserve xmlNodeSetSpacePreserve__internal_alias
@@ -2776,25 +2792,25 @@ extern __typeof (xmlNormalizeWindowsPath) xmlNormalizeWindowsPath__internal_alia
 extern __typeof (xmlNormalizeWindowsPath) xmlNormalizeWindowsPath __attribute((alias("xmlNormalizeWindowsPath__internal_alias")));
 #define xmlNormalizeWindowsPath xmlNormalizeWindowsPath__internal_alias
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlOutputBufferClose) xmlOutputBufferClose__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlOutputBufferClose) xmlOutputBufferClose __attribute((alias("xmlOutputBufferClose__internal_alias")));
 #define xmlOutputBufferClose xmlOutputBufferClose__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlOutputBufferCreateFd) xmlOutputBufferCreateFd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlOutputBufferCreateFd) xmlOutputBufferCreateFd __attribute((alias("xmlOutputBufferCreateFd__internal_alias")));
 #define xmlOutputBufferCreateFd xmlOutputBufferCreateFd__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlOutputBufferCreateFile) xmlOutputBufferCreateFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlOutputBufferCreateFile) xmlOutputBufferCreateFile __attribute((alias("xmlOutputBufferCreateFile__internal_alias")));
 #define xmlOutputBufferCreateFile xmlOutputBufferCreateFile__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlOutputBufferCreateFilename) xmlOutputBufferCreateFilename__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlOutputBufferCreateFilename) xmlOutputBufferCreateFilename __attribute((alias("xmlOutputBufferCreateFilename__internal_alias")));
 #define xmlOutputBufferCreateFilename xmlOutputBufferCreateFilename__internal_alias
@@ -2804,31 +2820,31 @@ extern __typeof (xmlOutputBufferCreateFilenameDefault) xmlOutputBufferCreateFile
 extern __typeof (xmlOutputBufferCreateFilenameDefault) xmlOutputBufferCreateFilenameDefault __attribute((alias("xmlOutputBufferCreateFilenameDefault__internal_alias")));
 #define xmlOutputBufferCreateFilenameDefault xmlOutputBufferCreateFilenameDefault__internal_alias
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlOutputBufferCreateIO) xmlOutputBufferCreateIO__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlOutputBufferCreateIO) xmlOutputBufferCreateIO __attribute((alias("xmlOutputBufferCreateIO__internal_alias")));
 #define xmlOutputBufferCreateIO xmlOutputBufferCreateIO__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlOutputBufferFlush) xmlOutputBufferFlush__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlOutputBufferFlush) xmlOutputBufferFlush __attribute((alias("xmlOutputBufferFlush__internal_alias")));
 #define xmlOutputBufferFlush xmlOutputBufferFlush__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlOutputBufferWrite) xmlOutputBufferWrite__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlOutputBufferWrite) xmlOutputBufferWrite __attribute((alias("xmlOutputBufferWrite__internal_alias")));
 #define xmlOutputBufferWrite xmlOutputBufferWrite__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlOutputBufferWriteEscape) xmlOutputBufferWriteEscape__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlOutputBufferWriteEscape) xmlOutputBufferWriteEscape __attribute((alias("xmlOutputBufferWriteEscape__internal_alias")));
 #define xmlOutputBufferWriteEscape xmlOutputBufferWriteEscape__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlOutputBufferWriteString) xmlOutputBufferWriteString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlOutputBufferWriteString) xmlOutputBufferWriteString __attribute((alias("xmlOutputBufferWriteString__internal_alias")));
 #define xmlOutputBufferWriteString xmlOutputBufferWriteString__internal_alias
@@ -2838,9 +2854,11 @@ extern __typeof (xmlParseAttValue) xmlParseAttValue__internal_alias __attribute(
 extern __typeof (xmlParseAttValue) xmlParseAttValue __attribute((alias("xmlParseAttValue__internal_alias")));
 #define xmlParseAttValue xmlParseAttValue__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseAttribute) xmlParseAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseAttribute) xmlParseAttribute __attribute((alias("xmlParseAttribute__internal_alias")));
 #define xmlParseAttribute xmlParseAttribute__internal_alias
+#endif
 
 extern __typeof (xmlParseAttributeListDecl) xmlParseAttributeListDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseAttributeListDecl) xmlParseAttributeListDecl __attribute((alias("xmlParseAttributeListDecl__internal_alias")));
@@ -2850,19 +2868,23 @@ extern __typeof (xmlParseAttributeType) xmlParseAttributeType__internal_alias __
 extern __typeof (xmlParseAttributeType) xmlParseAttributeType __attribute((alias("xmlParseAttributeType__internal_alias")));
 #define xmlParseAttributeType xmlParseAttributeType__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseBalancedChunkMemory) xmlParseBalancedChunkMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseBalancedChunkMemory) xmlParseBalancedChunkMemory __attribute((alias("xmlParseBalancedChunkMemory__internal_alias")));
 #define xmlParseBalancedChunkMemory xmlParseBalancedChunkMemory__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseBalancedChunkMemoryRecover) xmlParseBalancedChunkMemoryRecover__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseBalancedChunkMemoryRecover) xmlParseBalancedChunkMemoryRecover __attribute((alias("xmlParseBalancedChunkMemoryRecover__internal_alias")));
 #define xmlParseBalancedChunkMemoryRecover xmlParseBalancedChunkMemoryRecover__internal_alias
+#endif
 
 extern __typeof (xmlParseCDSect) xmlParseCDSect__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseCDSect) xmlParseCDSect __attribute((alias("xmlParseCDSect__internal_alias")));
 #define xmlParseCDSect xmlParseCDSect__internal_alias
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 extern __typeof (xmlParseCatalogFile) xmlParseCatalogFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseCatalogFile) xmlParseCatalogFile __attribute((alias("xmlParseCatalogFile__internal_alias")));
 #define xmlParseCatalogFile xmlParseCatalogFile__internal_alias
@@ -2880,7 +2902,7 @@ extern __typeof (xmlParseCharRef) xmlParseCharRef__internal_alias __attribute((v
 extern __typeof (xmlParseCharRef) xmlParseCharRef __attribute((alias("xmlParseCharRef__internal_alias")));
 #define xmlParseCharRef xmlParseCharRef__internal_alias
 
-#ifdef LIBXML_PUSH_ENABLED
+#if defined(LIBXML_PUSH_ENABLED)
 extern __typeof (xmlParseChunk) xmlParseChunk__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseChunk) xmlParseChunk __attribute((alias("xmlParseChunk__internal_alias")));
 #define xmlParseChunk xmlParseChunk__internal_alias
@@ -2898,17 +2920,21 @@ extern __typeof (xmlParseCtxtExternalEntity) xmlParseCtxtExternalEntity__interna
 extern __typeof (xmlParseCtxtExternalEntity) xmlParseCtxtExternalEntity __attribute((alias("xmlParseCtxtExternalEntity__internal_alias")));
 #define xmlParseCtxtExternalEntity xmlParseCtxtExternalEntity__internal_alias
 
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlParseDTD) xmlParseDTD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseDTD) xmlParseDTD __attribute((alias("xmlParseDTD__internal_alias")));
 #define xmlParseDTD xmlParseDTD__internal_alias
+#endif
 
 extern __typeof (xmlParseDefaultDecl) xmlParseDefaultDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseDefaultDecl) xmlParseDefaultDecl __attribute((alias("xmlParseDefaultDecl__internal_alias")));
 #define xmlParseDefaultDecl xmlParseDefaultDecl__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseDoc) xmlParseDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseDoc) xmlParseDoc __attribute((alias("xmlParseDoc__internal_alias")));
 #define xmlParseDoc xmlParseDoc__internal_alias
+#endif
 
 extern __typeof (xmlParseDocTypeDecl) xmlParseDocTypeDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseDocTypeDecl) xmlParseDocTypeDecl __attribute((alias("xmlParseDocTypeDecl__internal_alias")));
@@ -2946,13 +2972,17 @@ extern __typeof (xmlParseEncodingDecl) xmlParseEncodingDecl__internal_alias __at
 extern __typeof (xmlParseEncodingDecl) xmlParseEncodingDecl __attribute((alias("xmlParseEncodingDecl__internal_alias")));
 #define xmlParseEncodingDecl xmlParseEncodingDecl__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseEndTag) xmlParseEndTag__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseEndTag) xmlParseEndTag __attribute((alias("xmlParseEndTag__internal_alias")));
 #define xmlParseEndTag xmlParseEndTag__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseEntity) xmlParseEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseEntity) xmlParseEntity __attribute((alias("xmlParseEntity__internal_alias")));
 #define xmlParseEntity xmlParseEntity__internal_alias
+#endif
 
 extern __typeof (xmlParseEntityDecl) xmlParseEntityDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseEntityDecl) xmlParseEntityDecl __attribute((alias("xmlParseEntityDecl__internal_alias")));
@@ -2978,9 +3008,11 @@ extern __typeof (xmlParseExtParsedEnt) xmlParseExtParsedEnt__internal_alias __at
 extern __typeof (xmlParseExtParsedEnt) xmlParseExtParsedEnt __attribute((alias("xmlParseExtParsedEnt__internal_alias")));
 #define xmlParseExtParsedEnt xmlParseExtParsedEnt__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseExternalEntity) xmlParseExternalEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseExternalEntity) xmlParseExternalEntity __attribute((alias("xmlParseExternalEntity__internal_alias")));
 #define xmlParseExternalEntity xmlParseExternalEntity__internal_alias
+#endif
 
 extern __typeof (xmlParseExternalID) xmlParseExternalID__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseExternalID) xmlParseExternalID __attribute((alias("xmlParseExternalID__internal_alias")));
@@ -2990,9 +3022,11 @@ extern __typeof (xmlParseExternalSubset) xmlParseExternalSubset__internal_alias
 extern __typeof (xmlParseExternalSubset) xmlParseExternalSubset __attribute((alias("xmlParseExternalSubset__internal_alias")));
 #define xmlParseExternalSubset xmlParseExternalSubset__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseFile) xmlParseFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseFile) xmlParseFile __attribute((alias("xmlParseFile__internal_alias")));
 #define xmlParseFile xmlParseFile__internal_alias
+#endif
 
 extern __typeof (xmlParseInNodeContext) xmlParseInNodeContext__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseInNodeContext) xmlParseInNodeContext __attribute((alias("xmlParseInNodeContext__internal_alias")));
@@ -3002,9 +3036,11 @@ extern __typeof (xmlParseMarkupDecl) xmlParseMarkupDecl__internal_alias __attrib
 extern __typeof (xmlParseMarkupDecl) xmlParseMarkupDecl __attribute((alias("xmlParseMarkupDecl__internal_alias")));
 #define xmlParseMarkupDecl xmlParseMarkupDecl__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseMemory) xmlParseMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseMemory) xmlParseMemory __attribute((alias("xmlParseMemory__internal_alias")));
 #define xmlParseMemory xmlParseMemory__internal_alias
+#endif
 
 extern __typeof (xmlParseMisc) xmlParseMisc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseMisc) xmlParseMisc __attribute((alias("xmlParseMisc__internal_alias")));
@@ -3014,9 +3050,11 @@ extern __typeof (xmlParseName) xmlParseName__internal_alias __attribute((visibil
 extern __typeof (xmlParseName) xmlParseName __attribute((alias("xmlParseName__internal_alias")));
 #define xmlParseName xmlParseName__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlParseNamespace) xmlParseNamespace__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseNamespace) xmlParseNamespace __attribute((alias("xmlParseNamespace__internal_alias")));
 #define xmlParseNamespace xmlParseNamespace__internal_alias
+#endif
 
 extern __typeof (xmlParseNmtoken) xmlParseNmtoken__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseNmtoken) xmlParseNmtoken __attribute((alias("xmlParseNmtoken__internal_alias")));
@@ -3046,9 +3084,11 @@ extern __typeof (xmlParsePubidLiteral) xmlParsePubidLiteral__internal_alias __at
 extern __typeof (xmlParsePubidLiteral) xmlParsePubidLiteral __attribute((alias("xmlParsePubidLiteral__internal_alias")));
 #define xmlParsePubidLiteral xmlParsePubidLiteral__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlParseQuotedString) xmlParseQuotedString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseQuotedString) xmlParseQuotedString __attribute((alias("xmlParseQuotedString__internal_alias")));
 #define xmlParseQuotedString xmlParseQuotedString__internal_alias
+#endif
 
 extern __typeof (xmlParseReference) xmlParseReference__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseReference) xmlParseReference __attribute((alias("xmlParseReference__internal_alias")));
@@ -3058,9 +3098,11 @@ extern __typeof (xmlParseSDDecl) xmlParseSDDecl__internal_alias __attribute((vis
 extern __typeof (xmlParseSDDecl) xmlParseSDDecl __attribute((alias("xmlParseSDDecl__internal_alias")));
 #define xmlParseSDDecl xmlParseSDDecl__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlParseStartTag) xmlParseStartTag__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseStartTag) xmlParseStartTag __attribute((alias("xmlParseStartTag__internal_alias")));
 #define xmlParseStartTag xmlParseStartTag__internal_alias
+#endif
 
 extern __typeof (xmlParseSystemLiteral) xmlParseSystemLiteral__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParseSystemLiteral) xmlParseSystemLiteral __attribute((alias("xmlParseSystemLiteral__internal_alias")));
@@ -3114,9 +3156,11 @@ extern __typeof (xmlParserHandlePEReference) xmlParserHandlePEReference__interna
 extern __typeof (xmlParserHandlePEReference) xmlParserHandlePEReference __attribute((alias("xmlParserHandlePEReference__internal_alias")));
 #define xmlParserHandlePEReference xmlParserHandlePEReference__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlParserHandleReference) xmlParserHandleReference__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParserHandleReference) xmlParserHandleReference __attribute((alias("xmlParserHandleReference__internal_alias")));
 #define xmlParserHandleReference xmlParserHandleReference__internal_alias
+#endif
 
 extern __typeof (xmlParserInputBufferCreateFd) xmlParserInputBufferCreateFd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlParserInputBufferCreateFd) xmlParserInputBufferCreateFd __attribute((alias("xmlParserInputBufferCreateFd__internal_alias")));
@@ -3190,13 +3234,13 @@ extern __typeof (xmlParserWarning) xmlParserWarning__internal_alias __attribute(
 extern __typeof (xmlParserWarning) xmlParserWarning __attribute((alias("xmlParserWarning__internal_alias")));
 #define xmlParserWarning xmlParserWarning__internal_alias
 
-#ifdef LIBXML_PATTERN_ENABLED
+#if defined(LIBXML_PATTERN_ENABLED)
 extern __typeof (xmlPatternMatch) xmlPatternMatch__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlPatternMatch) xmlPatternMatch __attribute((alias("xmlPatternMatch__internal_alias")));
 #define xmlPatternMatch xmlPatternMatch__internal_alias
 #endif
 
-#ifdef LIBXML_PATTERN_ENABLED
+#if defined(LIBXML_PATTERN_ENABLED)
 extern __typeof (xmlPatterncompile) xmlPatterncompile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlPatterncompile) xmlPatterncompile __attribute((alias("xmlPatterncompile__internal_alias")));
 #define xmlPatterncompile xmlPatterncompile__internal_alias
@@ -3250,73 +3294,73 @@ extern __typeof (xmlReadMemory) xmlReadMemory__internal_alias __attribute((visib
 extern __typeof (xmlReadMemory) xmlReadMemory __attribute((alias("xmlReadMemory__internal_alias")));
 #define xmlReadMemory xmlReadMemory__internal_alias
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderForDoc) xmlReaderForDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderForDoc) xmlReaderForDoc __attribute((alias("xmlReaderForDoc__internal_alias")));
 #define xmlReaderForDoc xmlReaderForDoc__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderForFd) xmlReaderForFd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderForFd) xmlReaderForFd __attribute((alias("xmlReaderForFd__internal_alias")));
 #define xmlReaderForFd xmlReaderForFd__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderForFile) xmlReaderForFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderForFile) xmlReaderForFile __attribute((alias("xmlReaderForFile__internal_alias")));
 #define xmlReaderForFile xmlReaderForFile__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderForIO) xmlReaderForIO__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderForIO) xmlReaderForIO __attribute((alias("xmlReaderForIO__internal_alias")));
 #define xmlReaderForIO xmlReaderForIO__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderForMemory) xmlReaderForMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderForMemory) xmlReaderForMemory __attribute((alias("xmlReaderForMemory__internal_alias")));
 #define xmlReaderForMemory xmlReaderForMemory__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderNewDoc) xmlReaderNewDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderNewDoc) xmlReaderNewDoc __attribute((alias("xmlReaderNewDoc__internal_alias")));
 #define xmlReaderNewDoc xmlReaderNewDoc__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderNewFd) xmlReaderNewFd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderNewFd) xmlReaderNewFd __attribute((alias("xmlReaderNewFd__internal_alias")));
 #define xmlReaderNewFd xmlReaderNewFd__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderNewFile) xmlReaderNewFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderNewFile) xmlReaderNewFile __attribute((alias("xmlReaderNewFile__internal_alias")));
 #define xmlReaderNewFile xmlReaderNewFile__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderNewIO) xmlReaderNewIO__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderNewIO) xmlReaderNewIO __attribute((alias("xmlReaderNewIO__internal_alias")));
 #define xmlReaderNewIO xmlReaderNewIO__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderNewMemory) xmlReaderNewMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderNewMemory) xmlReaderNewMemory __attribute((alias("xmlReaderNewMemory__internal_alias")));
 #define xmlReaderNewMemory xmlReaderNewMemory__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderNewWalker) xmlReaderNewWalker__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderNewWalker) xmlReaderNewWalker __attribute((alias("xmlReaderNewWalker__internal_alias")));
 #define xmlReaderNewWalker xmlReaderNewWalker__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlReaderWalker) xmlReaderWalker__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReaderWalker) xmlReaderWalker __attribute((alias("xmlReaderWalker__internal_alias")));
 #define xmlReaderWalker xmlReaderWalker__internal_alias
@@ -3326,71 +3370,79 @@ extern __typeof (xmlReallocLoc) xmlReallocLoc__internal_alias __attribute((visib
 extern __typeof (xmlReallocLoc) xmlReallocLoc __attribute((alias("xmlReallocLoc__internal_alias")));
 #define xmlReallocLoc xmlReallocLoc__internal_alias
 
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlReconciliateNs) xmlReconciliateNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReconciliateNs) xmlReconciliateNs __attribute((alias("xmlReconciliateNs__internal_alias")));
 #define xmlReconciliateNs xmlReconciliateNs__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlRecoverDoc) xmlRecoverDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRecoverDoc) xmlRecoverDoc __attribute((alias("xmlRecoverDoc__internal_alias")));
 #define xmlRecoverDoc xmlRecoverDoc__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlRecoverFile) xmlRecoverFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRecoverFile) xmlRecoverFile __attribute((alias("xmlRecoverFile__internal_alias")));
 #define xmlRecoverFile xmlRecoverFile__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlRecoverMemory) xmlRecoverMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRecoverMemory) xmlRecoverMemory __attribute((alias("xmlRecoverMemory__internal_alias")));
 #define xmlRecoverMemory xmlRecoverMemory__internal_alias
+#endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlRegExecPushString) xmlRegExecPushString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegExecPushString) xmlRegExecPushString __attribute((alias("xmlRegExecPushString__internal_alias")));
 #define xmlRegExecPushString xmlRegExecPushString__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlRegExecPushString2) xmlRegExecPushString2__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegExecPushString2) xmlRegExecPushString2 __attribute((alias("xmlRegExecPushString2__internal_alias")));
 #define xmlRegExecPushString2 xmlRegExecPushString2__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlRegFreeExecCtxt) xmlRegFreeExecCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegFreeExecCtxt) xmlRegFreeExecCtxt __attribute((alias("xmlRegFreeExecCtxt__internal_alias")));
 #define xmlRegFreeExecCtxt xmlRegFreeExecCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlRegFreeRegexp) xmlRegFreeRegexp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegFreeRegexp) xmlRegFreeRegexp __attribute((alias("xmlRegFreeRegexp__internal_alias")));
 #define xmlRegFreeRegexp xmlRegFreeRegexp__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlRegNewExecCtxt) xmlRegNewExecCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegNewExecCtxt) xmlRegNewExecCtxt __attribute((alias("xmlRegNewExecCtxt__internal_alias")));
 #define xmlRegNewExecCtxt xmlRegNewExecCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlRegexpCompile) xmlRegexpCompile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegexpCompile) xmlRegexpCompile __attribute((alias("xmlRegexpCompile__internal_alias")));
 #define xmlRegexpCompile xmlRegexpCompile__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlRegexpExec) xmlRegexpExec__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegexpExec) xmlRegexpExec __attribute((alias("xmlRegexpExec__internal_alias")));
 #define xmlRegexpExec xmlRegexpExec__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlRegexpIsDeterminist) xmlRegexpIsDeterminist__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegexpIsDeterminist) xmlRegexpIsDeterminist __attribute((alias("xmlRegexpIsDeterminist__internal_alias")));
 #define xmlRegexpIsDeterminist xmlRegexpIsDeterminist__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlRegexpPrint) xmlRegexpPrint__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegexpPrint) xmlRegexpPrint __attribute((alias("xmlRegexpPrint__internal_alias")));
 #define xmlRegexpPrint xmlRegexpPrint__internal_alias
@@ -3404,13 +3456,13 @@ extern __typeof (xmlRegisterDefaultInputCallbacks) xmlRegisterDefaultInputCallba
 extern __typeof (xmlRegisterDefaultInputCallbacks) xmlRegisterDefaultInputCallbacks __attribute((alias("xmlRegisterDefaultInputCallbacks__internal_alias")));
 #define xmlRegisterDefaultInputCallbacks xmlRegisterDefaultInputCallbacks__internal_alias
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlRegisterDefaultOutputCallbacks) xmlRegisterDefaultOutputCallbacks__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegisterDefaultOutputCallbacks) xmlRegisterDefaultOutputCallbacks __attribute((alias("xmlRegisterDefaultOutputCallbacks__internal_alias")));
 #define xmlRegisterDefaultOutputCallbacks xmlRegisterDefaultOutputCallbacks__internal_alias
 #endif
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED) && defined(LIBXML_HTTP_ENABLED)
 extern __typeof (xmlRegisterHTTPPostCallbacks) xmlRegisterHTTPPostCallbacks__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegisterHTTPPostCallbacks) xmlRegisterHTTPPostCallbacks __attribute((alias("xmlRegisterHTTPPostCallbacks__internal_alias")));
 #define xmlRegisterHTTPPostCallbacks xmlRegisterHTTPPostCallbacks__internal_alias
@@ -3424,143 +3476,139 @@ extern __typeof (xmlRegisterNodeDefault) xmlRegisterNodeDefault__internal_alias
 extern __typeof (xmlRegisterNodeDefault) xmlRegisterNodeDefault __attribute((alias("xmlRegisterNodeDefault__internal_alias")));
 #define xmlRegisterNodeDefault xmlRegisterNodeDefault__internal_alias
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlRegisterOutputCallbacks) xmlRegisterOutputCallbacks__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRegisterOutputCallbacks) xmlRegisterOutputCallbacks __attribute((alias("xmlRegisterOutputCallbacks__internal_alias")));
 #define xmlRegisterOutputCallbacks xmlRegisterOutputCallbacks__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGCleanupTypes) xmlRelaxNGCleanupTypes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGCleanupTypes) xmlRelaxNGCleanupTypes __attribute((alias("xmlRelaxNGCleanupTypes__internal_alias")));
 #define xmlRelaxNGCleanupTypes xmlRelaxNGCleanupTypes__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlRelaxNGDump) xmlRelaxNGDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGDump) xmlRelaxNGDump __attribute((alias("xmlRelaxNGDump__internal_alias")));
 #define xmlRelaxNGDump xmlRelaxNGDump__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlRelaxNGDumpTree) xmlRelaxNGDumpTree__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGDumpTree) xmlRelaxNGDumpTree __attribute((alias("xmlRelaxNGDumpTree__internal_alias")));
 #define xmlRelaxNGDumpTree xmlRelaxNGDumpTree__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGFree) xmlRelaxNGFree__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGFree) xmlRelaxNGFree __attribute((alias("xmlRelaxNGFree__internal_alias")));
 #define xmlRelaxNGFree xmlRelaxNGFree__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGFreeParserCtxt) xmlRelaxNGFreeParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGFreeParserCtxt) xmlRelaxNGFreeParserCtxt __attribute((alias("xmlRelaxNGFreeParserCtxt__internal_alias")));
 #define xmlRelaxNGFreeParserCtxt xmlRelaxNGFreeParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGFreeValidCtxt) xmlRelaxNGFreeValidCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGFreeValidCtxt) xmlRelaxNGFreeValidCtxt __attribute((alias("xmlRelaxNGFreeValidCtxt__internal_alias")));
 #define xmlRelaxNGFreeValidCtxt xmlRelaxNGFreeValidCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGGetParserErrors) xmlRelaxNGGetParserErrors__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGGetParserErrors) xmlRelaxNGGetParserErrors __attribute((alias("xmlRelaxNGGetParserErrors__internal_alias")));
 #define xmlRelaxNGGetParserErrors xmlRelaxNGGetParserErrors__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGGetValidErrors) xmlRelaxNGGetValidErrors__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGGetValidErrors) xmlRelaxNGGetValidErrors __attribute((alias("xmlRelaxNGGetValidErrors__internal_alias")));
 #define xmlRelaxNGGetValidErrors xmlRelaxNGGetValidErrors__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGInitTypes) xmlRelaxNGInitTypes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGInitTypes) xmlRelaxNGInitTypes __attribute((alias("xmlRelaxNGInitTypes__internal_alias")));
 #define xmlRelaxNGInitTypes xmlRelaxNGInitTypes__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGNewDocParserCtxt) xmlRelaxNGNewDocParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGNewDocParserCtxt) xmlRelaxNGNewDocParserCtxt __attribute((alias("xmlRelaxNGNewDocParserCtxt__internal_alias")));
 #define xmlRelaxNGNewDocParserCtxt xmlRelaxNGNewDocParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGNewMemParserCtxt) xmlRelaxNGNewMemParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGNewMemParserCtxt) xmlRelaxNGNewMemParserCtxt __attribute((alias("xmlRelaxNGNewMemParserCtxt__internal_alias")));
 #define xmlRelaxNGNewMemParserCtxt xmlRelaxNGNewMemParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGNewParserCtxt) xmlRelaxNGNewParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGNewParserCtxt) xmlRelaxNGNewParserCtxt __attribute((alias("xmlRelaxNGNewParserCtxt__internal_alias")));
 #define xmlRelaxNGNewParserCtxt xmlRelaxNGNewParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGNewValidCtxt) xmlRelaxNGNewValidCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGNewValidCtxt) xmlRelaxNGNewValidCtxt __attribute((alias("xmlRelaxNGNewValidCtxt__internal_alias")));
 #define xmlRelaxNGNewValidCtxt xmlRelaxNGNewValidCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGParse) xmlRelaxNGParse__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGParse) xmlRelaxNGParse __attribute((alias("xmlRelaxNGParse__internal_alias")));
 #define xmlRelaxNGParse xmlRelaxNGParse__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGSetParserErrors) xmlRelaxNGSetParserErrors__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGSetParserErrors) xmlRelaxNGSetParserErrors __attribute((alias("xmlRelaxNGSetParserErrors__internal_alias")));
 #define xmlRelaxNGSetParserErrors xmlRelaxNGSetParserErrors__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGSetValidErrors) xmlRelaxNGSetValidErrors__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGSetValidErrors) xmlRelaxNGSetValidErrors __attribute((alias("xmlRelaxNGSetValidErrors__internal_alias")));
 #define xmlRelaxNGSetValidErrors xmlRelaxNGSetValidErrors__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGValidateDoc) xmlRelaxNGValidateDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGValidateDoc) xmlRelaxNGValidateDoc __attribute((alias("xmlRelaxNGValidateDoc__internal_alias")));
 #define xmlRelaxNGValidateDoc xmlRelaxNGValidateDoc__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGValidateFullElement) xmlRelaxNGValidateFullElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGValidateFullElement) xmlRelaxNGValidateFullElement __attribute((alias("xmlRelaxNGValidateFullElement__internal_alias")));
 #define xmlRelaxNGValidateFullElement xmlRelaxNGValidateFullElement__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGValidatePopElement) xmlRelaxNGValidatePopElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGValidatePopElement) xmlRelaxNGValidatePopElement __attribute((alias("xmlRelaxNGValidatePopElement__internal_alias")));
 #define xmlRelaxNGValidatePopElement xmlRelaxNGValidatePopElement__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGValidatePushCData) xmlRelaxNGValidatePushCData__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGValidatePushCData) xmlRelaxNGValidatePushCData __attribute((alias("xmlRelaxNGValidatePushCData__internal_alias")));
 #define xmlRelaxNGValidatePushCData xmlRelaxNGValidatePushCData__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxNGValidatePushElement) xmlRelaxNGValidatePushElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxNGValidatePushElement) xmlRelaxNGValidatePushElement __attribute((alias("xmlRelaxNGValidatePushElement__internal_alias")));
 #define xmlRelaxNGValidatePushElement xmlRelaxNGValidatePushElement__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlRelaxParserSetFlag) xmlRelaxParserSetFlag__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRelaxParserSetFlag) xmlRelaxParserSetFlag __attribute((alias("xmlRelaxParserSetFlag__internal_alias")));
 #define xmlRelaxParserSetFlag xmlRelaxParserSetFlag__internal_alias
@@ -3570,7 +3618,7 @@ extern __typeof (xmlRemoveID) xmlRemoveID__internal_alias __attribute((visibilit
 extern __typeof (xmlRemoveID) xmlRemoveID __attribute((alias("xmlRemoveID__internal_alias")));
 #define xmlRemoveID xmlRemoveID__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlRemoveProp) xmlRemoveProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlRemoveProp) xmlRemoveProp __attribute((alias("xmlRemoveProp__internal_alias")));
 #define xmlRemoveProp xmlRemoveProp__internal_alias
@@ -3580,7 +3628,7 @@ extern __typeof (xmlRemoveRef) xmlRemoveRef__internal_alias __attribute((visibil
 extern __typeof (xmlRemoveRef) xmlRemoveRef __attribute((alias("xmlRemoveRef__internal_alias")));
 #define xmlRemoveRef xmlRemoveRef__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlReplaceNode) xmlReplaceNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlReplaceNode) xmlReplaceNode __attribute((alias("xmlReplaceNode__internal_alias")));
 #define xmlReplaceNode xmlReplaceNode__internal_alias
@@ -3618,9 +3666,11 @@ extern __typeof (xmlSAX2EndDocument) xmlSAX2EndDocument__internal_alias __attrib
 extern __typeof (xmlSAX2EndDocument) xmlSAX2EndDocument __attribute((alias("xmlSAX2EndDocument__internal_alias")));
 #define xmlSAX2EndDocument xmlSAX2EndDocument__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)
 extern __typeof (xmlSAX2EndElement) xmlSAX2EndElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAX2EndElement) xmlSAX2EndElement __attribute((alias("xmlSAX2EndElement__internal_alias")));
 #define xmlSAX2EndElement xmlSAX2EndElement__internal_alias
+#endif
 
 extern __typeof (xmlSAX2EndElementNs) xmlSAX2EndElementNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAX2EndElementNs) xmlSAX2EndElementNs __attribute((alias("xmlSAX2EndElementNs__internal_alias")));
@@ -3674,13 +3724,13 @@ extern __typeof (xmlSAX2InitDefaultSAXHandler) xmlSAX2InitDefaultSAXHandler__int
 extern __typeof (xmlSAX2InitDefaultSAXHandler) xmlSAX2InitDefaultSAXHandler __attribute((alias("xmlSAX2InitDefaultSAXHandler__internal_alias")));
 #define xmlSAX2InitDefaultSAXHandler xmlSAX2InitDefaultSAXHandler__internal_alias
 
-#ifdef LIBXML_DOCB_ENABLED
+#if defined(LIBXML_DOCB_ENABLED)
 extern __typeof (xmlSAX2InitDocbDefaultSAXHandler) xmlSAX2InitDocbDefaultSAXHandler__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAX2InitDocbDefaultSAXHandler) xmlSAX2InitDocbDefaultSAXHandler __attribute((alias("xmlSAX2InitDocbDefaultSAXHandler__internal_alias")));
 #define xmlSAX2InitDocbDefaultSAXHandler xmlSAX2InitDocbDefaultSAXHandler__internal_alias
 #endif
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
 extern __typeof (xmlSAX2InitHtmlDefaultSAXHandler) xmlSAX2InitHtmlDefaultSAXHandler__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAX2InitHtmlDefaultSAXHandler) xmlSAX2InitHtmlDefaultSAXHandler __attribute((alias("xmlSAX2InitHtmlDefaultSAXHandler__internal_alias")));
 #define xmlSAX2InitHtmlDefaultSAXHandler xmlSAX2InitHtmlDefaultSAXHandler__internal_alias
@@ -3718,9 +3768,11 @@ extern __typeof (xmlSAX2StartDocument) xmlSAX2StartDocument__internal_alias __at
 extern __typeof (xmlSAX2StartDocument) xmlSAX2StartDocument __attribute((alias("xmlSAX2StartDocument__internal_alias")));
 #define xmlSAX2StartDocument xmlSAX2StartDocument__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)
 extern __typeof (xmlSAX2StartElement) xmlSAX2StartElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAX2StartElement) xmlSAX2StartElement __attribute((alias("xmlSAX2StartElement__internal_alias")));
 #define xmlSAX2StartElement xmlSAX2StartElement__internal_alias
+#endif
 
 extern __typeof (xmlSAX2StartElementNs) xmlSAX2StartElementNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAX2StartElementNs) xmlSAX2StartElementNs __attribute((alias("xmlSAX2StartElementNs__internal_alias")));
@@ -3730,135 +3782,155 @@ extern __typeof (xmlSAX2UnparsedEntityDecl) xmlSAX2UnparsedEntityDecl__internal_
 extern __typeof (xmlSAX2UnparsedEntityDecl) xmlSAX2UnparsedEntityDecl __attribute((alias("xmlSAX2UnparsedEntityDecl__internal_alias")));
 #define xmlSAX2UnparsedEntityDecl xmlSAX2UnparsedEntityDecl__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSAXDefaultVersion) xmlSAXDefaultVersion__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXDefaultVersion) xmlSAXDefaultVersion __attribute((alias("xmlSAXDefaultVersion__internal_alias")));
 #define xmlSAXDefaultVersion xmlSAXDefaultVersion__internal_alias
+#endif
 
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlSAXParseDTD) xmlSAXParseDTD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXParseDTD) xmlSAXParseDTD __attribute((alias("xmlSAXParseDTD__internal_alias")));
 #define xmlSAXParseDTD xmlSAXParseDTD__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSAXParseDoc) xmlSAXParseDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXParseDoc) xmlSAXParseDoc __attribute((alias("xmlSAXParseDoc__internal_alias")));
 #define xmlSAXParseDoc xmlSAXParseDoc__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSAXParseEntity) xmlSAXParseEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXParseEntity) xmlSAXParseEntity __attribute((alias("xmlSAXParseEntity__internal_alias")));
 #define xmlSAXParseEntity xmlSAXParseEntity__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSAXParseFile) xmlSAXParseFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXParseFile) xmlSAXParseFile __attribute((alias("xmlSAXParseFile__internal_alias")));
 #define xmlSAXParseFile xmlSAXParseFile__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSAXParseFileWithData) xmlSAXParseFileWithData__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXParseFileWithData) xmlSAXParseFileWithData __attribute((alias("xmlSAXParseFileWithData__internal_alias")));
 #define xmlSAXParseFileWithData xmlSAXParseFileWithData__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSAXParseMemory) xmlSAXParseMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXParseMemory) xmlSAXParseMemory __attribute((alias("xmlSAXParseMemory__internal_alias")));
 #define xmlSAXParseMemory xmlSAXParseMemory__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSAXParseMemoryWithData) xmlSAXParseMemoryWithData__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXParseMemoryWithData) xmlSAXParseMemoryWithData __attribute((alias("xmlSAXParseMemoryWithData__internal_alias")));
 #define xmlSAXParseMemoryWithData xmlSAXParseMemoryWithData__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSAXUserParseFile) xmlSAXUserParseFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXUserParseFile) xmlSAXUserParseFile __attribute((alias("xmlSAXUserParseFile__internal_alias")));
 #define xmlSAXUserParseFile xmlSAXUserParseFile__internal_alias
+#endif
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSAXUserParseMemory) xmlSAXUserParseMemory__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXUserParseMemory) xmlSAXUserParseMemory __attribute((alias("xmlSAXUserParseMemory__internal_alias")));
 #define xmlSAXUserParseMemory xmlSAXUserParseMemory__internal_alias
+#endif
 
 extern __typeof (xmlSAXVersion) xmlSAXVersion__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSAXVersion) xmlSAXVersion __attribute((alias("xmlSAXVersion__internal_alias")));
 #define xmlSAXVersion xmlSAXVersion__internal_alias
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveClose) xmlSaveClose__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveClose) xmlSaveClose __attribute((alias("xmlSaveClose__internal_alias")));
 #define xmlSaveClose xmlSaveClose__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveDoc) xmlSaveDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveDoc) xmlSaveDoc __attribute((alias("xmlSaveDoc__internal_alias")));
 #define xmlSaveDoc xmlSaveDoc__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveFile) xmlSaveFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveFile) xmlSaveFile __attribute((alias("xmlSaveFile__internal_alias")));
 #define xmlSaveFile xmlSaveFile__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveFileEnc) xmlSaveFileEnc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveFileEnc) xmlSaveFileEnc __attribute((alias("xmlSaveFileEnc__internal_alias")));
 #define xmlSaveFileEnc xmlSaveFileEnc__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveFileTo) xmlSaveFileTo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveFileTo) xmlSaveFileTo __attribute((alias("xmlSaveFileTo__internal_alias")));
 #define xmlSaveFileTo xmlSaveFileTo__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveFlush) xmlSaveFlush__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveFlush) xmlSaveFlush __attribute((alias("xmlSaveFlush__internal_alias")));
 #define xmlSaveFlush xmlSaveFlush__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveFormatFile) xmlSaveFormatFile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveFormatFile) xmlSaveFormatFile __attribute((alias("xmlSaveFormatFile__internal_alias")));
 #define xmlSaveFormatFile xmlSaveFormatFile__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveFormatFileEnc) xmlSaveFormatFileEnc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveFormatFileEnc) xmlSaveFormatFileEnc __attribute((alias("xmlSaveFormatFileEnc__internal_alias")));
 #define xmlSaveFormatFileEnc xmlSaveFormatFileEnc__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveFormatFileTo) xmlSaveFormatFileTo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveFormatFileTo) xmlSaveFormatFileTo __attribute((alias("xmlSaveFormatFileTo__internal_alias")));
 #define xmlSaveFormatFileTo xmlSaveFormatFileTo__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveSetAttrEscape) xmlSaveSetAttrEscape__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveSetAttrEscape) xmlSaveSetAttrEscape __attribute((alias("xmlSaveSetAttrEscape__internal_alias")));
 #define xmlSaveSetAttrEscape xmlSaveSetAttrEscape__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveSetEscape) xmlSaveSetEscape__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveSetEscape) xmlSaveSetEscape __attribute((alias("xmlSaveSetEscape__internal_alias")));
 #define xmlSaveSetEscape xmlSaveSetEscape__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveToFd) xmlSaveToFd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveToFd) xmlSaveToFd __attribute((alias("xmlSaveToFd__internal_alias")));
 #define xmlSaveToFd xmlSaveToFd__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveToFilename) xmlSaveToFilename__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveToFilename) xmlSaveToFilename __attribute((alias("xmlSaveToFilename__internal_alias")));
 #define xmlSaveToFilename xmlSaveToFilename__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveToIO) xmlSaveToIO__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveToIO) xmlSaveToIO __attribute((alias("xmlSaveToIO__internal_alias")));
 #define xmlSaveToIO xmlSaveToIO__internal_alias
 #endif
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSaveTree) xmlSaveTree__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSaveTree) xmlSaveTree __attribute((alias("xmlSaveTree__internal_alias")));
 #define xmlSaveTree xmlSaveTree__internal_alias
@@ -3868,246 +3940,252 @@ extern __typeof (xmlSaveUri) xmlSaveUri__internal_alias __attribute((visibility(
 extern __typeof (xmlSaveUri) xmlSaveUri __attribute((alias("xmlSaveUri__internal_alias")));
 #define xmlSaveUri xmlSaveUri__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlScanName) xmlScanName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlScanName) xmlScanName __attribute((alias("xmlScanName__internal_alias")));
 #define xmlScanName xmlScanName__internal_alias
+#endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaCheckFacet) xmlSchemaCheckFacet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaCheckFacet) xmlSchemaCheckFacet __attribute((alias("xmlSchemaCheckFacet__internal_alias")));
 #define xmlSchemaCheckFacet xmlSchemaCheckFacet__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaCleanupTypes) xmlSchemaCleanupTypes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaCleanupTypes) xmlSchemaCleanupTypes __attribute((alias("xmlSchemaCleanupTypes__internal_alias")));
 #define xmlSchemaCleanupTypes xmlSchemaCleanupTypes__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaCollapseString) xmlSchemaCollapseString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaCollapseString) xmlSchemaCollapseString __attribute((alias("xmlSchemaCollapseString__internal_alias")));
 #define xmlSchemaCollapseString xmlSchemaCollapseString__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaCompareValues) xmlSchemaCompareValues__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaCompareValues) xmlSchemaCompareValues __attribute((alias("xmlSchemaCompareValues__internal_alias")));
 #define xmlSchemaCompareValues xmlSchemaCompareValues__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSchemaDump) xmlSchemaDump__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaDump) xmlSchemaDump __attribute((alias("xmlSchemaDump__internal_alias")));
 #define xmlSchemaDump xmlSchemaDump__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaFree) xmlSchemaFree__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaFree) xmlSchemaFree __attribute((alias("xmlSchemaFree__internal_alias")));
 #define xmlSchemaFree xmlSchemaFree__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaFreeFacet) xmlSchemaFreeFacet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaFreeFacet) xmlSchemaFreeFacet __attribute((alias("xmlSchemaFreeFacet__internal_alias")));
 #define xmlSchemaFreeFacet xmlSchemaFreeFacet__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaFreeParserCtxt) xmlSchemaFreeParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaFreeParserCtxt) xmlSchemaFreeParserCtxt __attribute((alias("xmlSchemaFreeParserCtxt__internal_alias")));
 #define xmlSchemaFreeParserCtxt xmlSchemaFreeParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaFreeType) xmlSchemaFreeType__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaFreeType) xmlSchemaFreeType __attribute((alias("xmlSchemaFreeType__internal_alias")));
 #define xmlSchemaFreeType xmlSchemaFreeType__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaFreeValidCtxt) xmlSchemaFreeValidCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaFreeValidCtxt) xmlSchemaFreeValidCtxt __attribute((alias("xmlSchemaFreeValidCtxt__internal_alias")));
 #define xmlSchemaFreeValidCtxt xmlSchemaFreeValidCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaFreeValue) xmlSchemaFreeValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaFreeValue) xmlSchemaFreeValue __attribute((alias("xmlSchemaFreeValue__internal_alias")));
 #define xmlSchemaFreeValue xmlSchemaFreeValue__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaFreeWildcard) xmlSchemaFreeWildcard__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaFreeWildcard) xmlSchemaFreeWildcard __attribute((alias("xmlSchemaFreeWildcard__internal_alias")));
 #define xmlSchemaFreeWildcard xmlSchemaFreeWildcard__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaGetBuiltInListSimpleTypeItemType) xmlSchemaGetBuiltInListSimpleTypeItemType__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaGetBuiltInListSimpleTypeItemType) xmlSchemaGetBuiltInListSimpleTypeItemType __attribute((alias("xmlSchemaGetBuiltInListSimpleTypeItemType__internal_alias")));
 #define xmlSchemaGetBuiltInListSimpleTypeItemType xmlSchemaGetBuiltInListSimpleTypeItemType__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaGetBuiltInType) xmlSchemaGetBuiltInType__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaGetBuiltInType) xmlSchemaGetBuiltInType __attribute((alias("xmlSchemaGetBuiltInType__internal_alias")));
 #define xmlSchemaGetBuiltInType xmlSchemaGetBuiltInType__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaGetFacetValueAsULong) xmlSchemaGetFacetValueAsULong__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaGetFacetValueAsULong) xmlSchemaGetFacetValueAsULong __attribute((alias("xmlSchemaGetFacetValueAsULong__internal_alias")));
 #define xmlSchemaGetFacetValueAsULong xmlSchemaGetFacetValueAsULong__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaGetParserErrors) xmlSchemaGetParserErrors__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaGetParserErrors) xmlSchemaGetParserErrors __attribute((alias("xmlSchemaGetParserErrors__internal_alias")));
 #define xmlSchemaGetParserErrors xmlSchemaGetParserErrors__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaGetPredefinedType) xmlSchemaGetPredefinedType__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaGetPredefinedType) xmlSchemaGetPredefinedType __attribute((alias("xmlSchemaGetPredefinedType__internal_alias")));
 #define xmlSchemaGetPredefinedType xmlSchemaGetPredefinedType__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaGetValidErrors) xmlSchemaGetValidErrors__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaGetValidErrors) xmlSchemaGetValidErrors __attribute((alias("xmlSchemaGetValidErrors__internal_alias")));
 #define xmlSchemaGetValidErrors xmlSchemaGetValidErrors__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaInitTypes) xmlSchemaInitTypes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaInitTypes) xmlSchemaInitTypes __attribute((alias("xmlSchemaInitTypes__internal_alias")));
 #define xmlSchemaInitTypes xmlSchemaInitTypes__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaIsBuiltInTypeFacet) xmlSchemaIsBuiltInTypeFacet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaIsBuiltInTypeFacet) xmlSchemaIsBuiltInTypeFacet __attribute((alias("xmlSchemaIsBuiltInTypeFacet__internal_alias")));
 #define xmlSchemaIsBuiltInTypeFacet xmlSchemaIsBuiltInTypeFacet__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaNewDocParserCtxt) xmlSchemaNewDocParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaNewDocParserCtxt) xmlSchemaNewDocParserCtxt __attribute((alias("xmlSchemaNewDocParserCtxt__internal_alias")));
 #define xmlSchemaNewDocParserCtxt xmlSchemaNewDocParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaNewFacet) xmlSchemaNewFacet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaNewFacet) xmlSchemaNewFacet __attribute((alias("xmlSchemaNewFacet__internal_alias")));
 #define xmlSchemaNewFacet xmlSchemaNewFacet__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaNewMemParserCtxt) xmlSchemaNewMemParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaNewMemParserCtxt) xmlSchemaNewMemParserCtxt __attribute((alias("xmlSchemaNewMemParserCtxt__internal_alias")));
 #define xmlSchemaNewMemParserCtxt xmlSchemaNewMemParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaNewParserCtxt) xmlSchemaNewParserCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaNewParserCtxt) xmlSchemaNewParserCtxt __attribute((alias("xmlSchemaNewParserCtxt__internal_alias")));
 #define xmlSchemaNewParserCtxt xmlSchemaNewParserCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaNewValidCtxt) xmlSchemaNewValidCtxt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaNewValidCtxt) xmlSchemaNewValidCtxt __attribute((alias("xmlSchemaNewValidCtxt__internal_alias")));
 #define xmlSchemaNewValidCtxt xmlSchemaNewValidCtxt__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaParse) xmlSchemaParse__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaParse) xmlSchemaParse __attribute((alias("xmlSchemaParse__internal_alias")));
 #define xmlSchemaParse xmlSchemaParse__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaSetParserErrors) xmlSchemaSetParserErrors__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaSetParserErrors) xmlSchemaSetParserErrors __attribute((alias("xmlSchemaSetParserErrors__internal_alias")));
 #define xmlSchemaSetParserErrors xmlSchemaSetParserErrors__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaSetValidErrors) xmlSchemaSetValidErrors__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaSetValidErrors) xmlSchemaSetValidErrors __attribute((alias("xmlSchemaSetValidErrors__internal_alias")));
 #define xmlSchemaSetValidErrors xmlSchemaSetValidErrors__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaSetValidOptions) xmlSchemaSetValidOptions__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaSetValidOptions) xmlSchemaSetValidOptions __attribute((alias("xmlSchemaSetValidOptions__internal_alias")));
 #define xmlSchemaSetValidOptions xmlSchemaSetValidOptions__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValPredefTypeNode) xmlSchemaValPredefTypeNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValPredefTypeNode) xmlSchemaValPredefTypeNode __attribute((alias("xmlSchemaValPredefTypeNode__internal_alias")));
 #define xmlSchemaValPredefTypeNode xmlSchemaValPredefTypeNode__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValPredefTypeNodeNoNorm) xmlSchemaValPredefTypeNodeNoNorm__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValPredefTypeNodeNoNorm) xmlSchemaValPredefTypeNodeNoNorm __attribute((alias("xmlSchemaValPredefTypeNodeNoNorm__internal_alias")));
 #define xmlSchemaValPredefTypeNodeNoNorm xmlSchemaValPredefTypeNodeNoNorm__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValidCtxtGetOptions) xmlSchemaValidCtxtGetOptions__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValidCtxtGetOptions) xmlSchemaValidCtxtGetOptions __attribute((alias("xmlSchemaValidCtxtGetOptions__internal_alias")));
 #define xmlSchemaValidCtxtGetOptions xmlSchemaValidCtxtGetOptions__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValidateDoc) xmlSchemaValidateDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValidateDoc) xmlSchemaValidateDoc __attribute((alias("xmlSchemaValidateDoc__internal_alias")));
 #define xmlSchemaValidateDoc xmlSchemaValidateDoc__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValidateFacet) xmlSchemaValidateFacet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValidateFacet) xmlSchemaValidateFacet __attribute((alias("xmlSchemaValidateFacet__internal_alias")));
 #define xmlSchemaValidateFacet xmlSchemaValidateFacet__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValidateLengthFacet) xmlSchemaValidateLengthFacet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValidateLengthFacet) xmlSchemaValidateLengthFacet __attribute((alias("xmlSchemaValidateLengthFacet__internal_alias")));
 #define xmlSchemaValidateLengthFacet xmlSchemaValidateLengthFacet__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValidateListSimpleTypeFacet) xmlSchemaValidateListSimpleTypeFacet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValidateListSimpleTypeFacet) xmlSchemaValidateListSimpleTypeFacet __attribute((alias("xmlSchemaValidateListSimpleTypeFacet__internal_alias")));
 #define xmlSchemaValidateListSimpleTypeFacet xmlSchemaValidateListSimpleTypeFacet__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValidateOneElement) xmlSchemaValidateOneElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValidateOneElement) xmlSchemaValidateOneElement __attribute((alias("xmlSchemaValidateOneElement__internal_alias")));
 #define xmlSchemaValidateOneElement xmlSchemaValidateOneElement__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValidatePredefinedType) xmlSchemaValidatePredefinedType__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValidatePredefinedType) xmlSchemaValidatePredefinedType __attribute((alias("xmlSchemaValidatePredefinedType__internal_alias")));
 #define xmlSchemaValidatePredefinedType xmlSchemaValidatePredefinedType__internal_alias
 #endif
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlSchemaValidateStream) xmlSchemaValidateStream__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSchemaValidateStream) xmlSchemaValidateStream __attribute((alias("xmlSchemaValidateStream__internal_alias")));
 #define xmlSchemaValidateStream xmlSchemaValidateStream__internal_alias
 #endif
 
+#if defined(LIBXML_SCHEMAS_ENABLED)
+extern __typeof (xmlSchemaWhiteSpaceReplace) xmlSchemaWhiteSpaceReplace__internal_alias __attribute((visibility("hidden")));
+extern __typeof (xmlSchemaWhiteSpaceReplace) xmlSchemaWhiteSpaceReplace __attribute((alias("xmlSchemaWhiteSpaceReplace__internal_alias")));
+#define xmlSchemaWhiteSpaceReplace xmlSchemaWhiteSpaceReplace__internal_alias
+#endif
+
 extern __typeof (xmlSearchNs) xmlSearchNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSearchNs) xmlSearchNs __attribute((alias("xmlSearchNs__internal_alias")));
 #define xmlSearchNs xmlSearchNs__internal_alias
@@ -4128,17 +4206,21 @@ extern __typeof (xmlSetDocCompressMode) xmlSetDocCompressMode__internal_alias __
 extern __typeof (xmlSetDocCompressMode) xmlSetDocCompressMode __attribute((alias("xmlSetDocCompressMode__internal_alias")));
 #define xmlSetDocCompressMode xmlSetDocCompressMode__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlSetEntityReferenceFunc) xmlSetEntityReferenceFunc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSetEntityReferenceFunc) xmlSetEntityReferenceFunc __attribute((alias("xmlSetEntityReferenceFunc__internal_alias")));
 #define xmlSetEntityReferenceFunc xmlSetEntityReferenceFunc__internal_alias
+#endif
 
 extern __typeof (xmlSetExternalEntityLoader) xmlSetExternalEntityLoader__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSetExternalEntityLoader) xmlSetExternalEntityLoader __attribute((alias("xmlSetExternalEntityLoader__internal_alias")));
 #define xmlSetExternalEntityLoader xmlSetExternalEntityLoader__internal_alias
 
+#if defined(LIBXML_LEGACY_ENABLED)
 extern __typeof (xmlSetFeature) xmlSetFeature__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSetFeature) xmlSetFeature __attribute((alias("xmlSetFeature__internal_alias")));
 #define xmlSetFeature xmlSetFeature__internal_alias
+#endif
 
 extern __typeof (xmlSetGenericErrorFunc) xmlSetGenericErrorFunc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSetGenericErrorFunc) xmlSetGenericErrorFunc __attribute((alias("xmlSetGenericErrorFunc__internal_alias")));
@@ -4152,13 +4234,13 @@ extern __typeof (xmlSetNs) xmlSetNs__internal_alias __attribute((visibility("hid
 extern __typeof (xmlSetNs) xmlSetNs __attribute((alias("xmlSetNs__internal_alias")));
 #define xmlSetNs xmlSetNs__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED)
 extern __typeof (xmlSetNsProp) xmlSetNsProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSetNsProp) xmlSetNsProp __attribute((alias("xmlSetNsProp__internal_alias")));
 #define xmlSetNsProp xmlSetNsProp__internal_alias
 #endif
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED)
 extern __typeof (xmlSetProp) xmlSetProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSetProp) xmlSetProp __attribute((alias("xmlSetProp__internal_alias")));
 #define xmlSetProp xmlSetProp__internal_alias
@@ -4172,125 +4254,95 @@ extern __typeof (xmlSetTreeDoc) xmlSetTreeDoc__internal_alias __attribute((visib
 extern __typeof (xmlSetTreeDoc) xmlSetTreeDoc __attribute((alias("xmlSetTreeDoc__internal_alias")));
 #define xmlSetTreeDoc xmlSetTreeDoc__internal_alias
 
+#if defined(LIBXML_SAX1_ENABLED)
 extern __typeof (xmlSetupParserForBuffer) xmlSetupParserForBuffer__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSetupParserForBuffer) xmlSetupParserForBuffer __attribute((alias("xmlSetupParserForBuffer__internal_alias")));
 #define xmlSetupParserForBuffer xmlSetupParserForBuffer__internal_alias
+#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlShell) xmlShell__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShell) xmlShell __attribute((alias("xmlShell__internal_alias")));
 #define xmlShell xmlShell__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlShellBase) xmlShellBase__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellBase) xmlShellBase __attribute((alias("xmlShellBase__internal_alias")));
 #define xmlShellBase xmlShellBase__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlShellCat) xmlShellCat__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellCat) xmlShellCat __attribute((alias("xmlShellCat__internal_alias")));
 #define xmlShellCat xmlShellCat__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlShellDir) xmlShellDir__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellDir) xmlShellDir __attribute((alias("xmlShellDir__internal_alias")));
 #define xmlShellDir xmlShellDir__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlShellDu) xmlShellDu__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellDu) xmlShellDu __attribute((alias("xmlShellDu__internal_alias")));
 #define xmlShellDu xmlShellDu__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlShellList) xmlShellList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellList) xmlShellList __attribute((alias("xmlShellList__internal_alias")));
 #define xmlShellList xmlShellList__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlShellLoad) xmlShellLoad__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellLoad) xmlShellLoad __attribute((alias("xmlShellLoad__internal_alias")));
 #define xmlShellLoad xmlShellLoad__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlShellPrintNode) xmlShellPrintNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellPrintNode) xmlShellPrintNode __attribute((alias("xmlShellPrintNode__internal_alias")));
 #define xmlShellPrintNode xmlShellPrintNode__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlShellPrintXPathError) xmlShellPrintXPathError__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellPrintXPathError) xmlShellPrintXPathError __attribute((alias("xmlShellPrintXPathError__internal_alias")));
 #define xmlShellPrintXPathError xmlShellPrintXPathError__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlShellPrintXPathResult) xmlShellPrintXPathResult__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellPrintXPathResult) xmlShellPrintXPathResult __attribute((alias("xmlShellPrintXPathResult__internal_alias")));
 #define xmlShellPrintXPathResult xmlShellPrintXPathResult__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlShellPwd) xmlShellPwd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellPwd) xmlShellPwd __attribute((alias("xmlShellPwd__internal_alias")));
 #define xmlShellPwd xmlShellPwd__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlShellSave) xmlShellSave__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellSave) xmlShellSave __attribute((alias("xmlShellSave__internal_alias")));
 #define xmlShellSave xmlShellSave__internal_alias
 #endif
-#endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlShellValidate) xmlShellValidate__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellValidate) xmlShellValidate __attribute((alias("xmlShellValidate__internal_alias")));
 #define xmlShellValidate xmlShellValidate__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlShellWrite) xmlShellWrite__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlShellWrite) xmlShellWrite __attribute((alias("xmlShellWrite__internal_alias")));
 #define xmlShellWrite xmlShellWrite__internal_alias
 #endif
-#endif
-#endif
 
 extern __typeof (xmlSkipBlankChars) xmlSkipBlankChars__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSkipBlankChars) xmlSkipBlankChars __attribute((alias("xmlSkipBlankChars__internal_alias")));
@@ -4312,13 +4364,17 @@ extern __typeof (xmlSplitQName3) xmlSplitQName3__internal_alias __attribute((vis
 extern __typeof (xmlSplitQName3) xmlSplitQName3 __attribute((alias("xmlSplitQName3__internal_alias")));
 #define xmlSplitQName3 xmlSplitQName3__internal_alias
 
+#if defined(LIBXML_OUTPUT_ENABLED)
 extern __typeof (xmlSprintfElementContent) xmlSprintfElementContent__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlSprintfElementContent) xmlSprintfElementContent __attribute((alias("xmlSprintfElementContent__internal_alias")));
 #define xmlSprintfElementContent xmlSprintfElementContent__internal_alias
+#endif
 
+#if defined(LIBXML_PUSH_ENABLED)
 extern __typeof (xmlStopParser) xmlStopParser__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlStopParser) xmlStopParser __attribute((alias("xmlStopParser__internal_alias")));
 #define xmlStopParser xmlStopParser__internal_alias
+#endif
 
 extern __typeof (xmlStrEqual) xmlStrEqual__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlStrEqual) xmlStrEqual __attribute((alias("xmlStrEqual__internal_alias")));
@@ -4436,815 +4492,811 @@ extern __typeof (xmlTextMerge) xmlTextMerge__internal_alias __attribute((visibil
 extern __typeof (xmlTextMerge) xmlTextMerge __attribute((alias("xmlTextMerge__internal_alias")));
 #define xmlTextMerge xmlTextMerge__internal_alias
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderAttributeCount) xmlTextReaderAttributeCount__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderAttributeCount) xmlTextReaderAttributeCount __attribute((alias("xmlTextReaderAttributeCount__internal_alias")));
 #define xmlTextReaderAttributeCount xmlTextReaderAttributeCount__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderBaseUri) xmlTextReaderBaseUri__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderBaseUri) xmlTextReaderBaseUri __attribute((alias("xmlTextReaderBaseUri__internal_alias")));
 #define xmlTextReaderBaseUri xmlTextReaderBaseUri__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderClose) xmlTextReaderClose__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderClose) xmlTextReaderClose __attribute((alias("xmlTextReaderClose__internal_alias")));
 #define xmlTextReaderClose xmlTextReaderClose__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstBaseUri) xmlTextReaderConstBaseUri__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstBaseUri) xmlTextReaderConstBaseUri __attribute((alias("xmlTextReaderConstBaseUri__internal_alias")));
 #define xmlTextReaderConstBaseUri xmlTextReaderConstBaseUri__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstEncoding) xmlTextReaderConstEncoding__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstEncoding) xmlTextReaderConstEncoding __attribute((alias("xmlTextReaderConstEncoding__internal_alias")));
 #define xmlTextReaderConstEncoding xmlTextReaderConstEncoding__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstLocalName) xmlTextReaderConstLocalName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstLocalName) xmlTextReaderConstLocalName __attribute((alias("xmlTextReaderConstLocalName__internal_alias")));
 #define xmlTextReaderConstLocalName xmlTextReaderConstLocalName__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstName) xmlTextReaderConstName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstName) xmlTextReaderConstName __attribute((alias("xmlTextReaderConstName__internal_alias")));
 #define xmlTextReaderConstName xmlTextReaderConstName__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstNamespaceUri) xmlTextReaderConstNamespaceUri__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstNamespaceUri) xmlTextReaderConstNamespaceUri __attribute((alias("xmlTextReaderConstNamespaceUri__internal_alias")));
 #define xmlTextReaderConstNamespaceUri xmlTextReaderConstNamespaceUri__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstPrefix) xmlTextReaderConstPrefix__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstPrefix) xmlTextReaderConstPrefix __attribute((alias("xmlTextReaderConstPrefix__internal_alias")));
 #define xmlTextReaderConstPrefix xmlTextReaderConstPrefix__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstString) xmlTextReaderConstString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstString) xmlTextReaderConstString __attribute((alias("xmlTextReaderConstString__internal_alias")));
 #define xmlTextReaderConstString xmlTextReaderConstString__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstValue) xmlTextReaderConstValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstValue) xmlTextReaderConstValue __attribute((alias("xmlTextReaderConstValue__internal_alias")));
 #define xmlTextReaderConstValue xmlTextReaderConstValue__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstXmlLang) xmlTextReaderConstXmlLang__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstXmlLang) xmlTextReaderConstXmlLang __attribute((alias("xmlTextReaderConstXmlLang__internal_alias")));
 #define xmlTextReaderConstXmlLang xmlTextReaderConstXmlLang__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderConstXmlVersion) xmlTextReaderConstXmlVersion__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderConstXmlVersion) xmlTextReaderConstXmlVersion __attribute((alias("xmlTextReaderConstXmlVersion__internal_alias")));
 #define xmlTextReaderConstXmlVersion xmlTextReaderConstXmlVersion__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderCurrentDoc) xmlTextReaderCurrentDoc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderCurrentDoc) xmlTextReaderCurrentDoc __attribute((alias("xmlTextReaderCurrentDoc__internal_alias")));
 #define xmlTextReaderCurrentDoc xmlTextReaderCurrentDoc__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderCurrentNode) xmlTextReaderCurrentNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderCurrentNode) xmlTextReaderCurrentNode __attribute((alias("xmlTextReaderCurrentNode__internal_alias")));
 #define xmlTextReaderCurrentNode xmlTextReaderCurrentNode__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderDepth) xmlTextReaderDepth__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderDepth) xmlTextReaderDepth __attribute((alias("xmlTextReaderDepth__internal_alias")));
 #define xmlTextReaderDepth xmlTextReaderDepth__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderExpand) xmlTextReaderExpand__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderExpand) xmlTextReaderExpand __attribute((alias("xmlTextReaderExpand__internal_alias")));
 #define xmlTextReaderExpand xmlTextReaderExpand__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderGetAttribute) xmlTextReaderGetAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderGetAttribute) xmlTextReaderGetAttribute __attribute((alias("xmlTextReaderGetAttribute__internal_alias")));
 #define xmlTextReaderGetAttribute xmlTextReaderGetAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderGetAttributeNo) xmlTextReaderGetAttributeNo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderGetAttributeNo) xmlTextReaderGetAttributeNo __attribute((alias("xmlTextReaderGetAttributeNo__internal_alias")));
 #define xmlTextReaderGetAttributeNo xmlTextReaderGetAttributeNo__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderGetAttributeNs) xmlTextReaderGetAttributeNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderGetAttributeNs) xmlTextReaderGetAttributeNs __attribute((alias("xmlTextReaderGetAttributeNs__internal_alias")));
 #define xmlTextReaderGetAttributeNs xmlTextReaderGetAttributeNs__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderGetErrorHandler) xmlTextReaderGetErrorHandler__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderGetErrorHandler) xmlTextReaderGetErrorHandler __attribute((alias("xmlTextReaderGetErrorHandler__internal_alias")));
 #define xmlTextReaderGetErrorHandler xmlTextReaderGetErrorHandler__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderGetParserProp) xmlTextReaderGetParserProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderGetParserProp) xmlTextReaderGetParserProp __attribute((alias("xmlTextReaderGetParserProp__internal_alias")));
 #define xmlTextReaderGetParserProp xmlTextReaderGetParserProp__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderGetRemainder) xmlTextReaderGetRemainder__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderGetRemainder) xmlTextReaderGetRemainder __attribute((alias("xmlTextReaderGetRemainder__internal_alias")));
 #define xmlTextReaderGetRemainder xmlTextReaderGetRemainder__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderHasAttributes) xmlTextReaderHasAttributes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderHasAttributes) xmlTextReaderHasAttributes __attribute((alias("xmlTextReaderHasAttributes__internal_alias")));
 #define xmlTextReaderHasAttributes xmlTextReaderHasAttributes__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderHasValue) xmlTextReaderHasValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderHasValue) xmlTextReaderHasValue __attribute((alias("xmlTextReaderHasValue__internal_alias")));
 #define xmlTextReaderHasValue xmlTextReaderHasValue__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderIsDefault) xmlTextReaderIsDefault__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderIsDefault) xmlTextReaderIsDefault __attribute((alias("xmlTextReaderIsDefault__internal_alias")));
 #define xmlTextReaderIsDefault xmlTextReaderIsDefault__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderIsEmptyElement) xmlTextReaderIsEmptyElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderIsEmptyElement) xmlTextReaderIsEmptyElement __attribute((alias("xmlTextReaderIsEmptyElement__internal_alias")));
 #define xmlTextReaderIsEmptyElement xmlTextReaderIsEmptyElement__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderIsNamespaceDecl) xmlTextReaderIsNamespaceDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderIsNamespaceDecl) xmlTextReaderIsNamespaceDecl __attribute((alias("xmlTextReaderIsNamespaceDecl__internal_alias")));
 #define xmlTextReaderIsNamespaceDecl xmlTextReaderIsNamespaceDecl__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderIsValid) xmlTextReaderIsValid__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderIsValid) xmlTextReaderIsValid __attribute((alias("xmlTextReaderIsValid__internal_alias")));
 #define xmlTextReaderIsValid xmlTextReaderIsValid__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderLocalName) xmlTextReaderLocalName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderLocalName) xmlTextReaderLocalName __attribute((alias("xmlTextReaderLocalName__internal_alias")));
 #define xmlTextReaderLocalName xmlTextReaderLocalName__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderLocatorBaseURI) xmlTextReaderLocatorBaseURI__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderLocatorBaseURI) xmlTextReaderLocatorBaseURI __attribute((alias("xmlTextReaderLocatorBaseURI__internal_alias")));
 #define xmlTextReaderLocatorBaseURI xmlTextReaderLocatorBaseURI__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderLocatorLineNumber) xmlTextReaderLocatorLineNumber__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderLocatorLineNumber) xmlTextReaderLocatorLineNumber __attribute((alias("xmlTextReaderLocatorLineNumber__internal_alias")));
 #define xmlTextReaderLocatorLineNumber xmlTextReaderLocatorLineNumber__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderLookupNamespace) xmlTextReaderLookupNamespace__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderLookupNamespace) xmlTextReaderLookupNamespace __attribute((alias("xmlTextReaderLookupNamespace__internal_alias")));
 #define xmlTextReaderLookupNamespace xmlTextReaderLookupNamespace__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderMoveToAttribute) xmlTextReaderMoveToAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderMoveToAttribute) xmlTextReaderMoveToAttribute __attribute((alias("xmlTextReaderMoveToAttribute__internal_alias")));
 #define xmlTextReaderMoveToAttribute xmlTextReaderMoveToAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderMoveToAttributeNo) xmlTextReaderMoveToAttributeNo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderMoveToAttributeNo) xmlTextReaderMoveToAttributeNo __attribute((alias("xmlTextReaderMoveToAttributeNo__internal_alias")));
 #define xmlTextReaderMoveToAttributeNo xmlTextReaderMoveToAttributeNo__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderMoveToAttributeNs) xmlTextReaderMoveToAttributeNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderMoveToAttributeNs) xmlTextReaderMoveToAttributeNs __attribute((alias("xmlTextReaderMoveToAttributeNs__internal_alias")));
 #define xmlTextReaderMoveToAttributeNs xmlTextReaderMoveToAttributeNs__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderMoveToElement) xmlTextReaderMoveToElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderMoveToElement) xmlTextReaderMoveToElement __attribute((alias("xmlTextReaderMoveToElement__internal_alias")));
 #define xmlTextReaderMoveToElement xmlTextReaderMoveToElement__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderMoveToFirstAttribute) xmlTextReaderMoveToFirstAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderMoveToFirstAttribute) xmlTextReaderMoveToFirstAttribute __attribute((alias("xmlTextReaderMoveToFirstAttribute__internal_alias")));
 #define xmlTextReaderMoveToFirstAttribute xmlTextReaderMoveToFirstAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderMoveToNextAttribute) xmlTextReaderMoveToNextAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderMoveToNextAttribute) xmlTextReaderMoveToNextAttribute __attribute((alias("xmlTextReaderMoveToNextAttribute__internal_alias")));
 #define xmlTextReaderMoveToNextAttribute xmlTextReaderMoveToNextAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderName) xmlTextReaderName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderName) xmlTextReaderName __attribute((alias("xmlTextReaderName__internal_alias")));
 #define xmlTextReaderName xmlTextReaderName__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderNamespaceUri) xmlTextReaderNamespaceUri__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderNamespaceUri) xmlTextReaderNamespaceUri __attribute((alias("xmlTextReaderNamespaceUri__internal_alias")));
 #define xmlTextReaderNamespaceUri xmlTextReaderNamespaceUri__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderNext) xmlTextReaderNext__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderNext) xmlTextReaderNext __attribute((alias("xmlTextReaderNext__internal_alias")));
 #define xmlTextReaderNext xmlTextReaderNext__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderNextSibling) xmlTextReaderNextSibling__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderNextSibling) xmlTextReaderNextSibling __attribute((alias("xmlTextReaderNextSibling__internal_alias")));
 #define xmlTextReaderNextSibling xmlTextReaderNextSibling__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderNodeType) xmlTextReaderNodeType__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderNodeType) xmlTextReaderNodeType __attribute((alias("xmlTextReaderNodeType__internal_alias")));
 #define xmlTextReaderNodeType xmlTextReaderNodeType__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderNormalization) xmlTextReaderNormalization__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderNormalization) xmlTextReaderNormalization __attribute((alias("xmlTextReaderNormalization__internal_alias")));
 #define xmlTextReaderNormalization xmlTextReaderNormalization__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderPrefix) xmlTextReaderPrefix__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderPrefix) xmlTextReaderPrefix __attribute((alias("xmlTextReaderPrefix__internal_alias")));
 #define xmlTextReaderPrefix xmlTextReaderPrefix__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderPreserve) xmlTextReaderPreserve__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderPreserve) xmlTextReaderPreserve __attribute((alias("xmlTextReaderPreserve__internal_alias")));
 #define xmlTextReaderPreserve xmlTextReaderPreserve__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_PATTERN_ENABLED)
 extern __typeof (xmlTextReaderPreservePattern) xmlTextReaderPreservePattern__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderPreservePattern) xmlTextReaderPreservePattern __attribute((alias("xmlTextReaderPreservePattern__internal_alias")));
 #define xmlTextReaderPreservePattern xmlTextReaderPreservePattern__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderQuoteChar) xmlTextReaderQuoteChar__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderQuoteChar) xmlTextReaderQuoteChar __attribute((alias("xmlTextReaderQuoteChar__internal_alias")));
 #define xmlTextReaderQuoteChar xmlTextReaderQuoteChar__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderRead) xmlTextReaderRead__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderRead) xmlTextReaderRead __attribute((alias("xmlTextReaderRead__internal_alias")));
 #define xmlTextReaderRead xmlTextReaderRead__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderReadAttributeValue) xmlTextReaderReadAttributeValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderReadAttributeValue) xmlTextReaderReadAttributeValue __attribute((alias("xmlTextReaderReadAttributeValue__internal_alias")));
 #define xmlTextReaderReadAttributeValue xmlTextReaderReadAttributeValue__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderReadInnerXml) xmlTextReaderReadInnerXml__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderReadInnerXml) xmlTextReaderReadInnerXml __attribute((alias("xmlTextReaderReadInnerXml__internal_alias")));
 #define xmlTextReaderReadInnerXml xmlTextReaderReadInnerXml__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderReadOuterXml) xmlTextReaderReadOuterXml__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderReadOuterXml) xmlTextReaderReadOuterXml __attribute((alias("xmlTextReaderReadOuterXml__internal_alias")));
 #define xmlTextReaderReadOuterXml xmlTextReaderReadOuterXml__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderReadState) xmlTextReaderReadState__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderReadState) xmlTextReaderReadState __attribute((alias("xmlTextReaderReadState__internal_alias")));
 #define xmlTextReaderReadState xmlTextReaderReadState__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderReadString) xmlTextReaderReadString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderReadString) xmlTextReaderReadString __attribute((alias("xmlTextReaderReadString__internal_alias")));
 #define xmlTextReaderReadString xmlTextReaderReadString__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlTextReaderRelaxNGSetSchema) xmlTextReaderRelaxNGSetSchema__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderRelaxNGSetSchema) xmlTextReaderRelaxNGSetSchema __attribute((alias("xmlTextReaderRelaxNGSetSchema__internal_alias")));
 #define xmlTextReaderRelaxNGSetSchema xmlTextReaderRelaxNGSetSchema__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_READER_ENABLED
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlTextReaderRelaxNGValidate) xmlTextReaderRelaxNGValidate__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderRelaxNGValidate) xmlTextReaderRelaxNGValidate __attribute((alias("xmlTextReaderRelaxNGValidate__internal_alias")));
 #define xmlTextReaderRelaxNGValidate xmlTextReaderRelaxNGValidate__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderSetErrorHandler) xmlTextReaderSetErrorHandler__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderSetErrorHandler) xmlTextReaderSetErrorHandler __attribute((alias("xmlTextReaderSetErrorHandler__internal_alias")));
 #define xmlTextReaderSetErrorHandler xmlTextReaderSetErrorHandler__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderSetParserProp) xmlTextReaderSetParserProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderSetParserProp) xmlTextReaderSetParserProp __attribute((alias("xmlTextReaderSetParserProp__internal_alias")));
 #define xmlTextReaderSetParserProp xmlTextReaderSetParserProp__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderSetStructuredErrorHandler) xmlTextReaderSetStructuredErrorHandler__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderSetStructuredErrorHandler) xmlTextReaderSetStructuredErrorHandler __attribute((alias("xmlTextReaderSetStructuredErrorHandler__internal_alias")));
 #define xmlTextReaderSetStructuredErrorHandler xmlTextReaderSetStructuredErrorHandler__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderStandalone) xmlTextReaderStandalone__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderStandalone) xmlTextReaderStandalone __attribute((alias("xmlTextReaderStandalone__internal_alias")));
 #define xmlTextReaderStandalone xmlTextReaderStandalone__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderValue) xmlTextReaderValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderValue) xmlTextReaderValue __attribute((alias("xmlTextReaderValue__internal_alias")));
 #define xmlTextReaderValue xmlTextReaderValue__internal_alias
 #endif
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
 extern __typeof (xmlTextReaderXmlLang) xmlTextReaderXmlLang__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextReaderXmlLang) xmlTextReaderXmlLang __attribute((alias("xmlTextReaderXmlLang__internal_alias")));
 #define xmlTextReaderXmlLang xmlTextReaderXmlLang__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndAttribute) xmlTextWriterEndAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndAttribute) xmlTextWriterEndAttribute __attribute((alias("xmlTextWriterEndAttribute__internal_alias")));
 #define xmlTextWriterEndAttribute xmlTextWriterEndAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndCDATA) xmlTextWriterEndCDATA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndCDATA) xmlTextWriterEndCDATA __attribute((alias("xmlTextWriterEndCDATA__internal_alias")));
 #define xmlTextWriterEndCDATA xmlTextWriterEndCDATA__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndComment) xmlTextWriterEndComment__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndComment) xmlTextWriterEndComment __attribute((alias("xmlTextWriterEndComment__internal_alias")));
 #define xmlTextWriterEndComment xmlTextWriterEndComment__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndDTD) xmlTextWriterEndDTD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndDTD) xmlTextWriterEndDTD __attribute((alias("xmlTextWriterEndDTD__internal_alias")));
 #define xmlTextWriterEndDTD xmlTextWriterEndDTD__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndDTDAttlist) xmlTextWriterEndDTDAttlist__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndDTDAttlist) xmlTextWriterEndDTDAttlist __attribute((alias("xmlTextWriterEndDTDAttlist__internal_alias")));
 #define xmlTextWriterEndDTDAttlist xmlTextWriterEndDTDAttlist__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndDTDElement) xmlTextWriterEndDTDElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndDTDElement) xmlTextWriterEndDTDElement __attribute((alias("xmlTextWriterEndDTDElement__internal_alias")));
 #define xmlTextWriterEndDTDElement xmlTextWriterEndDTDElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndDTDEntity) xmlTextWriterEndDTDEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndDTDEntity) xmlTextWriterEndDTDEntity __attribute((alias("xmlTextWriterEndDTDEntity__internal_alias")));
 #define xmlTextWriterEndDTDEntity xmlTextWriterEndDTDEntity__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndDocument) xmlTextWriterEndDocument__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndDocument) xmlTextWriterEndDocument __attribute((alias("xmlTextWriterEndDocument__internal_alias")));
 #define xmlTextWriterEndDocument xmlTextWriterEndDocument__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndElement) xmlTextWriterEndElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndElement) xmlTextWriterEndElement __attribute((alias("xmlTextWriterEndElement__internal_alias")));
 #define xmlTextWriterEndElement xmlTextWriterEndElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterEndPI) xmlTextWriterEndPI__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterEndPI) xmlTextWriterEndPI __attribute((alias("xmlTextWriterEndPI__internal_alias")));
 #define xmlTextWriterEndPI xmlTextWriterEndPI__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterFlush) xmlTextWriterFlush__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterFlush) xmlTextWriterFlush __attribute((alias("xmlTextWriterFlush__internal_alias")));
 #define xmlTextWriterFlush xmlTextWriterFlush__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterFullEndElement) xmlTextWriterFullEndElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterFullEndElement) xmlTextWriterFullEndElement __attribute((alias("xmlTextWriterFullEndElement__internal_alias")));
 #define xmlTextWriterFullEndElement xmlTextWriterFullEndElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterSetIndent) xmlTextWriterSetIndent__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterSetIndent) xmlTextWriterSetIndent __attribute((alias("xmlTextWriterSetIndent__internal_alias")));
 #define xmlTextWriterSetIndent xmlTextWriterSetIndent__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterSetIndentString) xmlTextWriterSetIndentString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterSetIndentString) xmlTextWriterSetIndentString __attribute((alias("xmlTextWriterSetIndentString__internal_alias")));
 #define xmlTextWriterSetIndentString xmlTextWriterSetIndentString__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartAttribute) xmlTextWriterStartAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartAttribute) xmlTextWriterStartAttribute __attribute((alias("xmlTextWriterStartAttribute__internal_alias")));
 #define xmlTextWriterStartAttribute xmlTextWriterStartAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartAttributeNS) xmlTextWriterStartAttributeNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartAttributeNS) xmlTextWriterStartAttributeNS __attribute((alias("xmlTextWriterStartAttributeNS__internal_alias")));
 #define xmlTextWriterStartAttributeNS xmlTextWriterStartAttributeNS__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartCDATA) xmlTextWriterStartCDATA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartCDATA) xmlTextWriterStartCDATA __attribute((alias("xmlTextWriterStartCDATA__internal_alias")));
 #define xmlTextWriterStartCDATA xmlTextWriterStartCDATA__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartComment) xmlTextWriterStartComment__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartComment) xmlTextWriterStartComment __attribute((alias("xmlTextWriterStartComment__internal_alias")));
 #define xmlTextWriterStartComment xmlTextWriterStartComment__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartDTD) xmlTextWriterStartDTD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartDTD) xmlTextWriterStartDTD __attribute((alias("xmlTextWriterStartDTD__internal_alias")));
 #define xmlTextWriterStartDTD xmlTextWriterStartDTD__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartDTDAttlist) xmlTextWriterStartDTDAttlist__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartDTDAttlist) xmlTextWriterStartDTDAttlist __attribute((alias("xmlTextWriterStartDTDAttlist__internal_alias")));
 #define xmlTextWriterStartDTDAttlist xmlTextWriterStartDTDAttlist__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartDTDElement) xmlTextWriterStartDTDElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartDTDElement) xmlTextWriterStartDTDElement __attribute((alias("xmlTextWriterStartDTDElement__internal_alias")));
 #define xmlTextWriterStartDTDElement xmlTextWriterStartDTDElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartDTDEntity) xmlTextWriterStartDTDEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartDTDEntity) xmlTextWriterStartDTDEntity __attribute((alias("xmlTextWriterStartDTDEntity__internal_alias")));
 #define xmlTextWriterStartDTDEntity xmlTextWriterStartDTDEntity__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartDocument) xmlTextWriterStartDocument__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartDocument) xmlTextWriterStartDocument __attribute((alias("xmlTextWriterStartDocument__internal_alias")));
 #define xmlTextWriterStartDocument xmlTextWriterStartDocument__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartElement) xmlTextWriterStartElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartElement) xmlTextWriterStartElement __attribute((alias("xmlTextWriterStartElement__internal_alias")));
 #define xmlTextWriterStartElement xmlTextWriterStartElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartElementNS) xmlTextWriterStartElementNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartElementNS) xmlTextWriterStartElementNS __attribute((alias("xmlTextWriterStartElementNS__internal_alias")));
 #define xmlTextWriterStartElementNS xmlTextWriterStartElementNS__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterStartPI) xmlTextWriterStartPI__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterStartPI) xmlTextWriterStartPI __attribute((alias("xmlTextWriterStartPI__internal_alias")));
 #define xmlTextWriterStartPI xmlTextWriterStartPI__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteAttribute) xmlTextWriterWriteAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteAttribute) xmlTextWriterWriteAttribute __attribute((alias("xmlTextWriterWriteAttribute__internal_alias")));
 #define xmlTextWriterWriteAttribute xmlTextWriterWriteAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteAttributeNS) xmlTextWriterWriteAttributeNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteAttributeNS) xmlTextWriterWriteAttributeNS __attribute((alias("xmlTextWriterWriteAttributeNS__internal_alias")));
 #define xmlTextWriterWriteAttributeNS xmlTextWriterWriteAttributeNS__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteBase64) xmlTextWriterWriteBase64__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteBase64) xmlTextWriterWriteBase64 __attribute((alias("xmlTextWriterWriteBase64__internal_alias")));
 #define xmlTextWriterWriteBase64 xmlTextWriterWriteBase64__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteBinHex) xmlTextWriterWriteBinHex__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteBinHex) xmlTextWriterWriteBinHex __attribute((alias("xmlTextWriterWriteBinHex__internal_alias")));
 #define xmlTextWriterWriteBinHex xmlTextWriterWriteBinHex__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteCDATA) xmlTextWriterWriteCDATA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteCDATA) xmlTextWriterWriteCDATA __attribute((alias("xmlTextWriterWriteCDATA__internal_alias")));
 #define xmlTextWriterWriteCDATA xmlTextWriterWriteCDATA__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteComment) xmlTextWriterWriteComment__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteComment) xmlTextWriterWriteComment __attribute((alias("xmlTextWriterWriteComment__internal_alias")));
 #define xmlTextWriterWriteComment xmlTextWriterWriteComment__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteDTD) xmlTextWriterWriteDTD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteDTD) xmlTextWriterWriteDTD __attribute((alias("xmlTextWriterWriteDTD__internal_alias")));
 #define xmlTextWriterWriteDTD xmlTextWriterWriteDTD__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteDTDAttlist) xmlTextWriterWriteDTDAttlist__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteDTDAttlist) xmlTextWriterWriteDTDAttlist __attribute((alias("xmlTextWriterWriteDTDAttlist__internal_alias")));
 #define xmlTextWriterWriteDTDAttlist xmlTextWriterWriteDTDAttlist__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteDTDElement) xmlTextWriterWriteDTDElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteDTDElement) xmlTextWriterWriteDTDElement __attribute((alias("xmlTextWriterWriteDTDElement__internal_alias")));
 #define xmlTextWriterWriteDTDElement xmlTextWriterWriteDTDElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteDTDEntity) xmlTextWriterWriteDTDEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteDTDEntity) xmlTextWriterWriteDTDEntity __attribute((alias("xmlTextWriterWriteDTDEntity__internal_alias")));
 #define xmlTextWriterWriteDTDEntity xmlTextWriterWriteDTDEntity__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteDTDExternalEntity) xmlTextWriterWriteDTDExternalEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteDTDExternalEntity) xmlTextWriterWriteDTDExternalEntity __attribute((alias("xmlTextWriterWriteDTDExternalEntity__internal_alias")));
 #define xmlTextWriterWriteDTDExternalEntity xmlTextWriterWriteDTDExternalEntity__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteDTDExternalEntityContents) xmlTextWriterWriteDTDExternalEntityContents__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteDTDExternalEntityContents) xmlTextWriterWriteDTDExternalEntityContents __attribute((alias("xmlTextWriterWriteDTDExternalEntityContents__internal_alias")));
 #define xmlTextWriterWriteDTDExternalEntityContents xmlTextWriterWriteDTDExternalEntityContents__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteDTDInternalEntity) xmlTextWriterWriteDTDInternalEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteDTDInternalEntity) xmlTextWriterWriteDTDInternalEntity __attribute((alias("xmlTextWriterWriteDTDInternalEntity__internal_alias")));
 #define xmlTextWriterWriteDTDInternalEntity xmlTextWriterWriteDTDInternalEntity__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteDTDNotation) xmlTextWriterWriteDTDNotation__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteDTDNotation) xmlTextWriterWriteDTDNotation __attribute((alias("xmlTextWriterWriteDTDNotation__internal_alias")));
 #define xmlTextWriterWriteDTDNotation xmlTextWriterWriteDTDNotation__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteElement) xmlTextWriterWriteElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteElement) xmlTextWriterWriteElement __attribute((alias("xmlTextWriterWriteElement__internal_alias")));
 #define xmlTextWriterWriteElement xmlTextWriterWriteElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteElementNS) xmlTextWriterWriteElementNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteElementNS) xmlTextWriterWriteElementNS __attribute((alias("xmlTextWriterWriteElementNS__internal_alias")));
 #define xmlTextWriterWriteElementNS xmlTextWriterWriteElementNS__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatAttribute) xmlTextWriterWriteFormatAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatAttribute) xmlTextWriterWriteFormatAttribute __attribute((alias("xmlTextWriterWriteFormatAttribute__internal_alias")));
 #define xmlTextWriterWriteFormatAttribute xmlTextWriterWriteFormatAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatAttributeNS) xmlTextWriterWriteFormatAttributeNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatAttributeNS) xmlTextWriterWriteFormatAttributeNS __attribute((alias("xmlTextWriterWriteFormatAttributeNS__internal_alias")));
 #define xmlTextWriterWriteFormatAttributeNS xmlTextWriterWriteFormatAttributeNS__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatCDATA) xmlTextWriterWriteFormatCDATA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatCDATA) xmlTextWriterWriteFormatCDATA __attribute((alias("xmlTextWriterWriteFormatCDATA__internal_alias")));
 #define xmlTextWriterWriteFormatCDATA xmlTextWriterWriteFormatCDATA__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatComment) xmlTextWriterWriteFormatComment__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatComment) xmlTextWriterWriteFormatComment __attribute((alias("xmlTextWriterWriteFormatComment__internal_alias")));
 #define xmlTextWriterWriteFormatComment xmlTextWriterWriteFormatComment__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatDTD) xmlTextWriterWriteFormatDTD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatDTD) xmlTextWriterWriteFormatDTD __attribute((alias("xmlTextWriterWriteFormatDTD__internal_alias")));
 #define xmlTextWriterWriteFormatDTD xmlTextWriterWriteFormatDTD__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatDTDAttlist) xmlTextWriterWriteFormatDTDAttlist__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatDTDAttlist) xmlTextWriterWriteFormatDTDAttlist __attribute((alias("xmlTextWriterWriteFormatDTDAttlist__internal_alias")));
 #define xmlTextWriterWriteFormatDTDAttlist xmlTextWriterWriteFormatDTDAttlist__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatDTDElement) xmlTextWriterWriteFormatDTDElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatDTDElement) xmlTextWriterWriteFormatDTDElement __attribute((alias("xmlTextWriterWriteFormatDTDElement__internal_alias")));
 #define xmlTextWriterWriteFormatDTDElement xmlTextWriterWriteFormatDTDElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatDTDInternalEntity) xmlTextWriterWriteFormatDTDInternalEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatDTDInternalEntity) xmlTextWriterWriteFormatDTDInternalEntity __attribute((alias("xmlTextWriterWriteFormatDTDInternalEntity__internal_alias")));
 #define xmlTextWriterWriteFormatDTDInternalEntity xmlTextWriterWriteFormatDTDInternalEntity__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatElement) xmlTextWriterWriteFormatElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatElement) xmlTextWriterWriteFormatElement __attribute((alias("xmlTextWriterWriteFormatElement__internal_alias")));
 #define xmlTextWriterWriteFormatElement xmlTextWriterWriteFormatElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatElementNS) xmlTextWriterWriteFormatElementNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatElementNS) xmlTextWriterWriteFormatElementNS __attribute((alias("xmlTextWriterWriteFormatElementNS__internal_alias")));
 #define xmlTextWriterWriteFormatElementNS xmlTextWriterWriteFormatElementNS__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatPI) xmlTextWriterWriteFormatPI__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatPI) xmlTextWriterWriteFormatPI __attribute((alias("xmlTextWriterWriteFormatPI__internal_alias")));
 #define xmlTextWriterWriteFormatPI xmlTextWriterWriteFormatPI__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatRaw) xmlTextWriterWriteFormatRaw__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatRaw) xmlTextWriterWriteFormatRaw __attribute((alias("xmlTextWriterWriteFormatRaw__internal_alias")));
 #define xmlTextWriterWriteFormatRaw xmlTextWriterWriteFormatRaw__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteFormatString) xmlTextWriterWriteFormatString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteFormatString) xmlTextWriterWriteFormatString __attribute((alias("xmlTextWriterWriteFormatString__internal_alias")));
 #define xmlTextWriterWriteFormatString xmlTextWriterWriteFormatString__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWritePI) xmlTextWriterWritePI__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWritePI) xmlTextWriterWritePI __attribute((alias("xmlTextWriterWritePI__internal_alias")));
 #define xmlTextWriterWritePI xmlTextWriterWritePI__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteRaw) xmlTextWriterWriteRaw__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteRaw) xmlTextWriterWriteRaw __attribute((alias("xmlTextWriterWriteRaw__internal_alias")));
 #define xmlTextWriterWriteRaw xmlTextWriterWriteRaw__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteRawLen) xmlTextWriterWriteRawLen__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteRawLen) xmlTextWriterWriteRawLen __attribute((alias("xmlTextWriterWriteRawLen__internal_alias")));
 #define xmlTextWriterWriteRawLen xmlTextWriterWriteRawLen__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteString) xmlTextWriterWriteString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteString) xmlTextWriterWriteString __attribute((alias("xmlTextWriterWriteString__internal_alias")));
 #define xmlTextWriterWriteString xmlTextWriterWriteString__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatAttribute) xmlTextWriterWriteVFormatAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatAttribute) xmlTextWriterWriteVFormatAttribute __attribute((alias("xmlTextWriterWriteVFormatAttribute__internal_alias")));
 #define xmlTextWriterWriteVFormatAttribute xmlTextWriterWriteVFormatAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatAttributeNS) xmlTextWriterWriteVFormatAttributeNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatAttributeNS) xmlTextWriterWriteVFormatAttributeNS __attribute((alias("xmlTextWriterWriteVFormatAttributeNS__internal_alias")));
 #define xmlTextWriterWriteVFormatAttributeNS xmlTextWriterWriteVFormatAttributeNS__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatCDATA) xmlTextWriterWriteVFormatCDATA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatCDATA) xmlTextWriterWriteVFormatCDATA __attribute((alias("xmlTextWriterWriteVFormatCDATA__internal_alias")));
 #define xmlTextWriterWriteVFormatCDATA xmlTextWriterWriteVFormatCDATA__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatComment) xmlTextWriterWriteVFormatComment__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatComment) xmlTextWriterWriteVFormatComment __attribute((alias("xmlTextWriterWriteVFormatComment__internal_alias")));
 #define xmlTextWriterWriteVFormatComment xmlTextWriterWriteVFormatComment__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatDTD) xmlTextWriterWriteVFormatDTD__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatDTD) xmlTextWriterWriteVFormatDTD __attribute((alias("xmlTextWriterWriteVFormatDTD__internal_alias")));
 #define xmlTextWriterWriteVFormatDTD xmlTextWriterWriteVFormatDTD__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatDTDAttlist) xmlTextWriterWriteVFormatDTDAttlist__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatDTDAttlist) xmlTextWriterWriteVFormatDTDAttlist __attribute((alias("xmlTextWriterWriteVFormatDTDAttlist__internal_alias")));
 #define xmlTextWriterWriteVFormatDTDAttlist xmlTextWriterWriteVFormatDTDAttlist__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatDTDElement) xmlTextWriterWriteVFormatDTDElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatDTDElement) xmlTextWriterWriteVFormatDTDElement __attribute((alias("xmlTextWriterWriteVFormatDTDElement__internal_alias")));
 #define xmlTextWriterWriteVFormatDTDElement xmlTextWriterWriteVFormatDTDElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatDTDInternalEntity) xmlTextWriterWriteVFormatDTDInternalEntity__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatDTDInternalEntity) xmlTextWriterWriteVFormatDTDInternalEntity __attribute((alias("xmlTextWriterWriteVFormatDTDInternalEntity__internal_alias")));
 #define xmlTextWriterWriteVFormatDTDInternalEntity xmlTextWriterWriteVFormatDTDInternalEntity__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatElement) xmlTextWriterWriteVFormatElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatElement) xmlTextWriterWriteVFormatElement __attribute((alias("xmlTextWriterWriteVFormatElement__internal_alias")));
 #define xmlTextWriterWriteVFormatElement xmlTextWriterWriteVFormatElement__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatElementNS) xmlTextWriterWriteVFormatElementNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatElementNS) xmlTextWriterWriteVFormatElementNS __attribute((alias("xmlTextWriterWriteVFormatElementNS__internal_alias")));
 #define xmlTextWriterWriteVFormatElementNS xmlTextWriterWriteVFormatElementNS__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatPI) xmlTextWriterWriteVFormatPI__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatPI) xmlTextWriterWriteVFormatPI __attribute((alias("xmlTextWriterWriteVFormatPI__internal_alias")));
 #define xmlTextWriterWriteVFormatPI xmlTextWriterWriteVFormatPI__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatRaw) xmlTextWriterWriteVFormatRaw__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatRaw) xmlTextWriterWriteVFormatRaw __attribute((alias("xmlTextWriterWriteVFormatRaw__internal_alias")));
 #define xmlTextWriterWriteVFormatRaw xmlTextWriterWriteVFormatRaw__internal_alias
 #endif
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
 extern __typeof (xmlTextWriterWriteVFormatString) xmlTextWriterWriteVFormatString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlTextWriterWriteVFormatString) xmlTextWriterWriteVFormatString __attribute((alias("xmlTextWriterWriteVFormatString__internal_alias")));
 #define xmlTextWriterWriteVFormatString xmlTextWriterWriteVFormatString__internal_alias
@@ -5326,997 +5378,997 @@ extern __typeof (xmlThrDefTreeIndentString) xmlThrDefTreeIndentString__internal_
 extern __typeof (xmlThrDefTreeIndentString) xmlThrDefTreeIndentString __attribute((alias("xmlThrDefTreeIndentString__internal_alias")));
 #define xmlThrDefTreeIndentString xmlThrDefTreeIndentString__internal_alias
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsAegeanNumbers) xmlUCSIsAegeanNumbers__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsAegeanNumbers) xmlUCSIsAegeanNumbers __attribute((alias("xmlUCSIsAegeanNumbers__internal_alias")));
 #define xmlUCSIsAegeanNumbers xmlUCSIsAegeanNumbers__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsAlphabeticPresentationForms) xmlUCSIsAlphabeticPresentationForms__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsAlphabeticPresentationForms) xmlUCSIsAlphabeticPresentationForms __attribute((alias("xmlUCSIsAlphabeticPresentationForms__internal_alias")));
 #define xmlUCSIsAlphabeticPresentationForms xmlUCSIsAlphabeticPresentationForms__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsArabic) xmlUCSIsArabic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsArabic) xmlUCSIsArabic __attribute((alias("xmlUCSIsArabic__internal_alias")));
 #define xmlUCSIsArabic xmlUCSIsArabic__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsArabicPresentationFormsA) xmlUCSIsArabicPresentationFormsA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsArabicPresentationFormsA) xmlUCSIsArabicPresentationFormsA __attribute((alias("xmlUCSIsArabicPresentationFormsA__internal_alias")));
 #define xmlUCSIsArabicPresentationFormsA xmlUCSIsArabicPresentationFormsA__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsArabicPresentationFormsB) xmlUCSIsArabicPresentationFormsB__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsArabicPresentationFormsB) xmlUCSIsArabicPresentationFormsB __attribute((alias("xmlUCSIsArabicPresentationFormsB__internal_alias")));
 #define xmlUCSIsArabicPresentationFormsB xmlUCSIsArabicPresentationFormsB__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsArmenian) xmlUCSIsArmenian__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsArmenian) xmlUCSIsArmenian __attribute((alias("xmlUCSIsArmenian__internal_alias")));
 #define xmlUCSIsArmenian xmlUCSIsArmenian__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsArrows) xmlUCSIsArrows__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsArrows) xmlUCSIsArrows __attribute((alias("xmlUCSIsArrows__internal_alias")));
 #define xmlUCSIsArrows xmlUCSIsArrows__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsBasicLatin) xmlUCSIsBasicLatin__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsBasicLatin) xmlUCSIsBasicLatin __attribute((alias("xmlUCSIsBasicLatin__internal_alias")));
 #define xmlUCSIsBasicLatin xmlUCSIsBasicLatin__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsBengali) xmlUCSIsBengali__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsBengali) xmlUCSIsBengali __attribute((alias("xmlUCSIsBengali__internal_alias")));
 #define xmlUCSIsBengali xmlUCSIsBengali__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsBlock) xmlUCSIsBlock__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsBlock) xmlUCSIsBlock __attribute((alias("xmlUCSIsBlock__internal_alias")));
 #define xmlUCSIsBlock xmlUCSIsBlock__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsBlockElements) xmlUCSIsBlockElements__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsBlockElements) xmlUCSIsBlockElements __attribute((alias("xmlUCSIsBlockElements__internal_alias")));
 #define xmlUCSIsBlockElements xmlUCSIsBlockElements__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsBopomofo) xmlUCSIsBopomofo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsBopomofo) xmlUCSIsBopomofo __attribute((alias("xmlUCSIsBopomofo__internal_alias")));
 #define xmlUCSIsBopomofo xmlUCSIsBopomofo__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsBopomofoExtended) xmlUCSIsBopomofoExtended__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsBopomofoExtended) xmlUCSIsBopomofoExtended __attribute((alias("xmlUCSIsBopomofoExtended__internal_alias")));
 #define xmlUCSIsBopomofoExtended xmlUCSIsBopomofoExtended__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsBoxDrawing) xmlUCSIsBoxDrawing__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsBoxDrawing) xmlUCSIsBoxDrawing __attribute((alias("xmlUCSIsBoxDrawing__internal_alias")));
 #define xmlUCSIsBoxDrawing xmlUCSIsBoxDrawing__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsBraillePatterns) xmlUCSIsBraillePatterns__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsBraillePatterns) xmlUCSIsBraillePatterns __attribute((alias("xmlUCSIsBraillePatterns__internal_alias")));
 #define xmlUCSIsBraillePatterns xmlUCSIsBraillePatterns__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsBuhid) xmlUCSIsBuhid__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsBuhid) xmlUCSIsBuhid __attribute((alias("xmlUCSIsBuhid__internal_alias")));
 #define xmlUCSIsBuhid xmlUCSIsBuhid__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsByzantineMusicalSymbols) xmlUCSIsByzantineMusicalSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsByzantineMusicalSymbols) xmlUCSIsByzantineMusicalSymbols __attribute((alias("xmlUCSIsByzantineMusicalSymbols__internal_alias")));
 #define xmlUCSIsByzantineMusicalSymbols xmlUCSIsByzantineMusicalSymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCJKCompatibility) xmlUCSIsCJKCompatibility__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCJKCompatibility) xmlUCSIsCJKCompatibility __attribute((alias("xmlUCSIsCJKCompatibility__internal_alias")));
 #define xmlUCSIsCJKCompatibility xmlUCSIsCJKCompatibility__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCJKCompatibilityForms) xmlUCSIsCJKCompatibilityForms__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCJKCompatibilityForms) xmlUCSIsCJKCompatibilityForms __attribute((alias("xmlUCSIsCJKCompatibilityForms__internal_alias")));
 #define xmlUCSIsCJKCompatibilityForms xmlUCSIsCJKCompatibilityForms__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCJKCompatibilityIdeographs) xmlUCSIsCJKCompatibilityIdeographs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCJKCompatibilityIdeographs) xmlUCSIsCJKCompatibilityIdeographs __attribute((alias("xmlUCSIsCJKCompatibilityIdeographs__internal_alias")));
 #define xmlUCSIsCJKCompatibilityIdeographs xmlUCSIsCJKCompatibilityIdeographs__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCJKCompatibilityIdeographsSupplement) xmlUCSIsCJKCompatibilityIdeographsSupplement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCJKCompatibilityIdeographsSupplement) xmlUCSIsCJKCompatibilityIdeographsSupplement __attribute((alias("xmlUCSIsCJKCompatibilityIdeographsSupplement__internal_alias")));
 #define xmlUCSIsCJKCompatibilityIdeographsSupplement xmlUCSIsCJKCompatibilityIdeographsSupplement__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCJKRadicalsSupplement) xmlUCSIsCJKRadicalsSupplement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCJKRadicalsSupplement) xmlUCSIsCJKRadicalsSupplement __attribute((alias("xmlUCSIsCJKRadicalsSupplement__internal_alias")));
 #define xmlUCSIsCJKRadicalsSupplement xmlUCSIsCJKRadicalsSupplement__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCJKSymbolsandPunctuation) xmlUCSIsCJKSymbolsandPunctuation__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCJKSymbolsandPunctuation) xmlUCSIsCJKSymbolsandPunctuation __attribute((alias("xmlUCSIsCJKSymbolsandPunctuation__internal_alias")));
 #define xmlUCSIsCJKSymbolsandPunctuation xmlUCSIsCJKSymbolsandPunctuation__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCJKUnifiedIdeographs) xmlUCSIsCJKUnifiedIdeographs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCJKUnifiedIdeographs) xmlUCSIsCJKUnifiedIdeographs __attribute((alias("xmlUCSIsCJKUnifiedIdeographs__internal_alias")));
 #define xmlUCSIsCJKUnifiedIdeographs xmlUCSIsCJKUnifiedIdeographs__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCJKUnifiedIdeographsExtensionA) xmlUCSIsCJKUnifiedIdeographsExtensionA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCJKUnifiedIdeographsExtensionA) xmlUCSIsCJKUnifiedIdeographsExtensionA __attribute((alias("xmlUCSIsCJKUnifiedIdeographsExtensionA__internal_alias")));
 #define xmlUCSIsCJKUnifiedIdeographsExtensionA xmlUCSIsCJKUnifiedIdeographsExtensionA__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCJKUnifiedIdeographsExtensionB) xmlUCSIsCJKUnifiedIdeographsExtensionB__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCJKUnifiedIdeographsExtensionB) xmlUCSIsCJKUnifiedIdeographsExtensionB __attribute((alias("xmlUCSIsCJKUnifiedIdeographsExtensionB__internal_alias")));
 #define xmlUCSIsCJKUnifiedIdeographsExtensionB xmlUCSIsCJKUnifiedIdeographsExtensionB__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCat) xmlUCSIsCat__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCat) xmlUCSIsCat __attribute((alias("xmlUCSIsCat__internal_alias")));
 #define xmlUCSIsCat xmlUCSIsCat__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatC) xmlUCSIsCatC__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatC) xmlUCSIsCatC __attribute((alias("xmlUCSIsCatC__internal_alias")));
 #define xmlUCSIsCatC xmlUCSIsCatC__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatCc) xmlUCSIsCatCc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatCc) xmlUCSIsCatCc __attribute((alias("xmlUCSIsCatCc__internal_alias")));
 #define xmlUCSIsCatCc xmlUCSIsCatCc__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatCf) xmlUCSIsCatCf__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatCf) xmlUCSIsCatCf __attribute((alias("xmlUCSIsCatCf__internal_alias")));
 #define xmlUCSIsCatCf xmlUCSIsCatCf__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatCo) xmlUCSIsCatCo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatCo) xmlUCSIsCatCo __attribute((alias("xmlUCSIsCatCo__internal_alias")));
 #define xmlUCSIsCatCo xmlUCSIsCatCo__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatCs) xmlUCSIsCatCs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatCs) xmlUCSIsCatCs __attribute((alias("xmlUCSIsCatCs__internal_alias")));
 #define xmlUCSIsCatCs xmlUCSIsCatCs__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatL) xmlUCSIsCatL__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatL) xmlUCSIsCatL __attribute((alias("xmlUCSIsCatL__internal_alias")));
 #define xmlUCSIsCatL xmlUCSIsCatL__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatLl) xmlUCSIsCatLl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatLl) xmlUCSIsCatLl __attribute((alias("xmlUCSIsCatLl__internal_alias")));
 #define xmlUCSIsCatLl xmlUCSIsCatLl__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatLm) xmlUCSIsCatLm__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatLm) xmlUCSIsCatLm __attribute((alias("xmlUCSIsCatLm__internal_alias")));
 #define xmlUCSIsCatLm xmlUCSIsCatLm__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatLo) xmlUCSIsCatLo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatLo) xmlUCSIsCatLo __attribute((alias("xmlUCSIsCatLo__internal_alias")));
 #define xmlUCSIsCatLo xmlUCSIsCatLo__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatLt) xmlUCSIsCatLt__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatLt) xmlUCSIsCatLt __attribute((alias("xmlUCSIsCatLt__internal_alias")));
 #define xmlUCSIsCatLt xmlUCSIsCatLt__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatLu) xmlUCSIsCatLu__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatLu) xmlUCSIsCatLu __attribute((alias("xmlUCSIsCatLu__internal_alias")));
 #define xmlUCSIsCatLu xmlUCSIsCatLu__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatM) xmlUCSIsCatM__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatM) xmlUCSIsCatM __attribute((alias("xmlUCSIsCatM__internal_alias")));
 #define xmlUCSIsCatM xmlUCSIsCatM__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatMc) xmlUCSIsCatMc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatMc) xmlUCSIsCatMc __attribute((alias("xmlUCSIsCatMc__internal_alias")));
 #define xmlUCSIsCatMc xmlUCSIsCatMc__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatMe) xmlUCSIsCatMe__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatMe) xmlUCSIsCatMe __attribute((alias("xmlUCSIsCatMe__internal_alias")));
 #define xmlUCSIsCatMe xmlUCSIsCatMe__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatMn) xmlUCSIsCatMn__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatMn) xmlUCSIsCatMn __attribute((alias("xmlUCSIsCatMn__internal_alias")));
 #define xmlUCSIsCatMn xmlUCSIsCatMn__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatN) xmlUCSIsCatN__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatN) xmlUCSIsCatN __attribute((alias("xmlUCSIsCatN__internal_alias")));
 #define xmlUCSIsCatN xmlUCSIsCatN__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatNd) xmlUCSIsCatNd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatNd) xmlUCSIsCatNd __attribute((alias("xmlUCSIsCatNd__internal_alias")));
 #define xmlUCSIsCatNd xmlUCSIsCatNd__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatNl) xmlUCSIsCatNl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatNl) xmlUCSIsCatNl __attribute((alias("xmlUCSIsCatNl__internal_alias")));
 #define xmlUCSIsCatNl xmlUCSIsCatNl__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatNo) xmlUCSIsCatNo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatNo) xmlUCSIsCatNo __attribute((alias("xmlUCSIsCatNo__internal_alias")));
 #define xmlUCSIsCatNo xmlUCSIsCatNo__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatP) xmlUCSIsCatP__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatP) xmlUCSIsCatP __attribute((alias("xmlUCSIsCatP__internal_alias")));
 #define xmlUCSIsCatP xmlUCSIsCatP__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatPc) xmlUCSIsCatPc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatPc) xmlUCSIsCatPc __attribute((alias("xmlUCSIsCatPc__internal_alias")));
 #define xmlUCSIsCatPc xmlUCSIsCatPc__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatPd) xmlUCSIsCatPd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatPd) xmlUCSIsCatPd __attribute((alias("xmlUCSIsCatPd__internal_alias")));
 #define xmlUCSIsCatPd xmlUCSIsCatPd__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatPe) xmlUCSIsCatPe__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatPe) xmlUCSIsCatPe __attribute((alias("xmlUCSIsCatPe__internal_alias")));
 #define xmlUCSIsCatPe xmlUCSIsCatPe__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatPf) xmlUCSIsCatPf__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatPf) xmlUCSIsCatPf __attribute((alias("xmlUCSIsCatPf__internal_alias")));
 #define xmlUCSIsCatPf xmlUCSIsCatPf__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatPi) xmlUCSIsCatPi__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatPi) xmlUCSIsCatPi __attribute((alias("xmlUCSIsCatPi__internal_alias")));
 #define xmlUCSIsCatPi xmlUCSIsCatPi__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatPo) xmlUCSIsCatPo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatPo) xmlUCSIsCatPo __attribute((alias("xmlUCSIsCatPo__internal_alias")));
 #define xmlUCSIsCatPo xmlUCSIsCatPo__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatPs) xmlUCSIsCatPs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatPs) xmlUCSIsCatPs __attribute((alias("xmlUCSIsCatPs__internal_alias")));
 #define xmlUCSIsCatPs xmlUCSIsCatPs__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatS) xmlUCSIsCatS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatS) xmlUCSIsCatS __attribute((alias("xmlUCSIsCatS__internal_alias")));
 #define xmlUCSIsCatS xmlUCSIsCatS__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatSc) xmlUCSIsCatSc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatSc) xmlUCSIsCatSc __attribute((alias("xmlUCSIsCatSc__internal_alias")));
 #define xmlUCSIsCatSc xmlUCSIsCatSc__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatSk) xmlUCSIsCatSk__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatSk) xmlUCSIsCatSk __attribute((alias("xmlUCSIsCatSk__internal_alias")));
 #define xmlUCSIsCatSk xmlUCSIsCatSk__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatSm) xmlUCSIsCatSm__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatSm) xmlUCSIsCatSm __attribute((alias("xmlUCSIsCatSm__internal_alias")));
 #define xmlUCSIsCatSm xmlUCSIsCatSm__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatSo) xmlUCSIsCatSo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatSo) xmlUCSIsCatSo __attribute((alias("xmlUCSIsCatSo__internal_alias")));
 #define xmlUCSIsCatSo xmlUCSIsCatSo__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatZ) xmlUCSIsCatZ__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatZ) xmlUCSIsCatZ __attribute((alias("xmlUCSIsCatZ__internal_alias")));
 #define xmlUCSIsCatZ xmlUCSIsCatZ__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatZl) xmlUCSIsCatZl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatZl) xmlUCSIsCatZl __attribute((alias("xmlUCSIsCatZl__internal_alias")));
 #define xmlUCSIsCatZl xmlUCSIsCatZl__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatZp) xmlUCSIsCatZp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatZp) xmlUCSIsCatZp __attribute((alias("xmlUCSIsCatZp__internal_alias")));
 #define xmlUCSIsCatZp xmlUCSIsCatZp__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCatZs) xmlUCSIsCatZs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCatZs) xmlUCSIsCatZs __attribute((alias("xmlUCSIsCatZs__internal_alias")));
 #define xmlUCSIsCatZs xmlUCSIsCatZs__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCherokee) xmlUCSIsCherokee__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCherokee) xmlUCSIsCherokee __attribute((alias("xmlUCSIsCherokee__internal_alias")));
 #define xmlUCSIsCherokee xmlUCSIsCherokee__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCombiningDiacriticalMarks) xmlUCSIsCombiningDiacriticalMarks__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCombiningDiacriticalMarks) xmlUCSIsCombiningDiacriticalMarks __attribute((alias("xmlUCSIsCombiningDiacriticalMarks__internal_alias")));
 #define xmlUCSIsCombiningDiacriticalMarks xmlUCSIsCombiningDiacriticalMarks__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCombiningDiacriticalMarksforSymbols) xmlUCSIsCombiningDiacriticalMarksforSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCombiningDiacriticalMarksforSymbols) xmlUCSIsCombiningDiacriticalMarksforSymbols __attribute((alias("xmlUCSIsCombiningDiacriticalMarksforSymbols__internal_alias")));
 #define xmlUCSIsCombiningDiacriticalMarksforSymbols xmlUCSIsCombiningDiacriticalMarksforSymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCombiningHalfMarks) xmlUCSIsCombiningHalfMarks__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCombiningHalfMarks) xmlUCSIsCombiningHalfMarks __attribute((alias("xmlUCSIsCombiningHalfMarks__internal_alias")));
 #define xmlUCSIsCombiningHalfMarks xmlUCSIsCombiningHalfMarks__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCombiningMarksforSymbols) xmlUCSIsCombiningMarksforSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCombiningMarksforSymbols) xmlUCSIsCombiningMarksforSymbols __attribute((alias("xmlUCSIsCombiningMarksforSymbols__internal_alias")));
 #define xmlUCSIsCombiningMarksforSymbols xmlUCSIsCombiningMarksforSymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsControlPictures) xmlUCSIsControlPictures__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsControlPictures) xmlUCSIsControlPictures __attribute((alias("xmlUCSIsControlPictures__internal_alias")));
 #define xmlUCSIsControlPictures xmlUCSIsControlPictures__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCurrencySymbols) xmlUCSIsCurrencySymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCurrencySymbols) xmlUCSIsCurrencySymbols __attribute((alias("xmlUCSIsCurrencySymbols__internal_alias")));
 #define xmlUCSIsCurrencySymbols xmlUCSIsCurrencySymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCypriotSyllabary) xmlUCSIsCypriotSyllabary__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCypriotSyllabary) xmlUCSIsCypriotSyllabary __attribute((alias("xmlUCSIsCypriotSyllabary__internal_alias")));
 #define xmlUCSIsCypriotSyllabary xmlUCSIsCypriotSyllabary__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCyrillic) xmlUCSIsCyrillic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCyrillic) xmlUCSIsCyrillic __attribute((alias("xmlUCSIsCyrillic__internal_alias")));
 #define xmlUCSIsCyrillic xmlUCSIsCyrillic__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsCyrillicSupplement) xmlUCSIsCyrillicSupplement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsCyrillicSupplement) xmlUCSIsCyrillicSupplement __attribute((alias("xmlUCSIsCyrillicSupplement__internal_alias")));
 #define xmlUCSIsCyrillicSupplement xmlUCSIsCyrillicSupplement__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsDeseret) xmlUCSIsDeseret__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsDeseret) xmlUCSIsDeseret __attribute((alias("xmlUCSIsDeseret__internal_alias")));
 #define xmlUCSIsDeseret xmlUCSIsDeseret__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsDevanagari) xmlUCSIsDevanagari__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsDevanagari) xmlUCSIsDevanagari __attribute((alias("xmlUCSIsDevanagari__internal_alias")));
 #define xmlUCSIsDevanagari xmlUCSIsDevanagari__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsDingbats) xmlUCSIsDingbats__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsDingbats) xmlUCSIsDingbats __attribute((alias("xmlUCSIsDingbats__internal_alias")));
 #define xmlUCSIsDingbats xmlUCSIsDingbats__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsEnclosedAlphanumerics) xmlUCSIsEnclosedAlphanumerics__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsEnclosedAlphanumerics) xmlUCSIsEnclosedAlphanumerics __attribute((alias("xmlUCSIsEnclosedAlphanumerics__internal_alias")));
 #define xmlUCSIsEnclosedAlphanumerics xmlUCSIsEnclosedAlphanumerics__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsEnclosedCJKLettersandMonths) xmlUCSIsEnclosedCJKLettersandMonths__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsEnclosedCJKLettersandMonths) xmlUCSIsEnclosedCJKLettersandMonths __attribute((alias("xmlUCSIsEnclosedCJKLettersandMonths__internal_alias")));
 #define xmlUCSIsEnclosedCJKLettersandMonths xmlUCSIsEnclosedCJKLettersandMonths__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsEthiopic) xmlUCSIsEthiopic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsEthiopic) xmlUCSIsEthiopic __attribute((alias("xmlUCSIsEthiopic__internal_alias")));
 #define xmlUCSIsEthiopic xmlUCSIsEthiopic__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsGeneralPunctuation) xmlUCSIsGeneralPunctuation__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsGeneralPunctuation) xmlUCSIsGeneralPunctuation __attribute((alias("xmlUCSIsGeneralPunctuation__internal_alias")));
 #define xmlUCSIsGeneralPunctuation xmlUCSIsGeneralPunctuation__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsGeometricShapes) xmlUCSIsGeometricShapes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsGeometricShapes) xmlUCSIsGeometricShapes __attribute((alias("xmlUCSIsGeometricShapes__internal_alias")));
 #define xmlUCSIsGeometricShapes xmlUCSIsGeometricShapes__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsGeorgian) xmlUCSIsGeorgian__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsGeorgian) xmlUCSIsGeorgian __attribute((alias("xmlUCSIsGeorgian__internal_alias")));
 #define xmlUCSIsGeorgian xmlUCSIsGeorgian__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsGothic) xmlUCSIsGothic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsGothic) xmlUCSIsGothic __attribute((alias("xmlUCSIsGothic__internal_alias")));
 #define xmlUCSIsGothic xmlUCSIsGothic__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsGreek) xmlUCSIsGreek__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsGreek) xmlUCSIsGreek __attribute((alias("xmlUCSIsGreek__internal_alias")));
 #define xmlUCSIsGreek xmlUCSIsGreek__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsGreekExtended) xmlUCSIsGreekExtended__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsGreekExtended) xmlUCSIsGreekExtended __attribute((alias("xmlUCSIsGreekExtended__internal_alias")));
 #define xmlUCSIsGreekExtended xmlUCSIsGreekExtended__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsGreekandCoptic) xmlUCSIsGreekandCoptic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsGreekandCoptic) xmlUCSIsGreekandCoptic __attribute((alias("xmlUCSIsGreekandCoptic__internal_alias")));
 #define xmlUCSIsGreekandCoptic xmlUCSIsGreekandCoptic__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsGujarati) xmlUCSIsGujarati__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsGujarati) xmlUCSIsGujarati __attribute((alias("xmlUCSIsGujarati__internal_alias")));
 #define xmlUCSIsGujarati xmlUCSIsGujarati__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsGurmukhi) xmlUCSIsGurmukhi__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsGurmukhi) xmlUCSIsGurmukhi __attribute((alias("xmlUCSIsGurmukhi__internal_alias")));
 #define xmlUCSIsGurmukhi xmlUCSIsGurmukhi__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsHalfwidthandFullwidthForms) xmlUCSIsHalfwidthandFullwidthForms__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsHalfwidthandFullwidthForms) xmlUCSIsHalfwidthandFullwidthForms __attribute((alias("xmlUCSIsHalfwidthandFullwidthForms__internal_alias")));
 #define xmlUCSIsHalfwidthandFullwidthForms xmlUCSIsHalfwidthandFullwidthForms__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsHangulCompatibilityJamo) xmlUCSIsHangulCompatibilityJamo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsHangulCompatibilityJamo) xmlUCSIsHangulCompatibilityJamo __attribute((alias("xmlUCSIsHangulCompatibilityJamo__internal_alias")));
 #define xmlUCSIsHangulCompatibilityJamo xmlUCSIsHangulCompatibilityJamo__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsHangulJamo) xmlUCSIsHangulJamo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsHangulJamo) xmlUCSIsHangulJamo __attribute((alias("xmlUCSIsHangulJamo__internal_alias")));
 #define xmlUCSIsHangulJamo xmlUCSIsHangulJamo__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsHangulSyllables) xmlUCSIsHangulSyllables__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsHangulSyllables) xmlUCSIsHangulSyllables __attribute((alias("xmlUCSIsHangulSyllables__internal_alias")));
 #define xmlUCSIsHangulSyllables xmlUCSIsHangulSyllables__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsHanunoo) xmlUCSIsHanunoo__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsHanunoo) xmlUCSIsHanunoo __attribute((alias("xmlUCSIsHanunoo__internal_alias")));
 #define xmlUCSIsHanunoo xmlUCSIsHanunoo__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsHebrew) xmlUCSIsHebrew__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsHebrew) xmlUCSIsHebrew __attribute((alias("xmlUCSIsHebrew__internal_alias")));
 #define xmlUCSIsHebrew xmlUCSIsHebrew__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsHighPrivateUseSurrogates) xmlUCSIsHighPrivateUseSurrogates__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsHighPrivateUseSurrogates) xmlUCSIsHighPrivateUseSurrogates __attribute((alias("xmlUCSIsHighPrivateUseSurrogates__internal_alias")));
 #define xmlUCSIsHighPrivateUseSurrogates xmlUCSIsHighPrivateUseSurrogates__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsHighSurrogates) xmlUCSIsHighSurrogates__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsHighSurrogates) xmlUCSIsHighSurrogates __attribute((alias("xmlUCSIsHighSurrogates__internal_alias")));
 #define xmlUCSIsHighSurrogates xmlUCSIsHighSurrogates__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsHiragana) xmlUCSIsHiragana__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsHiragana) xmlUCSIsHiragana __attribute((alias("xmlUCSIsHiragana__internal_alias")));
 #define xmlUCSIsHiragana xmlUCSIsHiragana__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsIPAExtensions) xmlUCSIsIPAExtensions__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsIPAExtensions) xmlUCSIsIPAExtensions __attribute((alias("xmlUCSIsIPAExtensions__internal_alias")));
 #define xmlUCSIsIPAExtensions xmlUCSIsIPAExtensions__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsIdeographicDescriptionCharacters) xmlUCSIsIdeographicDescriptionCharacters__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsIdeographicDescriptionCharacters) xmlUCSIsIdeographicDescriptionCharacters __attribute((alias("xmlUCSIsIdeographicDescriptionCharacters__internal_alias")));
 #define xmlUCSIsIdeographicDescriptionCharacters xmlUCSIsIdeographicDescriptionCharacters__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsKanbun) xmlUCSIsKanbun__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsKanbun) xmlUCSIsKanbun __attribute((alias("xmlUCSIsKanbun__internal_alias")));
 #define xmlUCSIsKanbun xmlUCSIsKanbun__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsKangxiRadicals) xmlUCSIsKangxiRadicals__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsKangxiRadicals) xmlUCSIsKangxiRadicals __attribute((alias("xmlUCSIsKangxiRadicals__internal_alias")));
 #define xmlUCSIsKangxiRadicals xmlUCSIsKangxiRadicals__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsKannada) xmlUCSIsKannada__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsKannada) xmlUCSIsKannada __attribute((alias("xmlUCSIsKannada__internal_alias")));
 #define xmlUCSIsKannada xmlUCSIsKannada__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsKatakana) xmlUCSIsKatakana__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsKatakana) xmlUCSIsKatakana __attribute((alias("xmlUCSIsKatakana__internal_alias")));
 #define xmlUCSIsKatakana xmlUCSIsKatakana__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsKatakanaPhoneticExtensions) xmlUCSIsKatakanaPhoneticExtensions__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsKatakanaPhoneticExtensions) xmlUCSIsKatakanaPhoneticExtensions __attribute((alias("xmlUCSIsKatakanaPhoneticExtensions__internal_alias")));
 #define xmlUCSIsKatakanaPhoneticExtensions xmlUCSIsKatakanaPhoneticExtensions__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsKhmer) xmlUCSIsKhmer__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsKhmer) xmlUCSIsKhmer __attribute((alias("xmlUCSIsKhmer__internal_alias")));
 #define xmlUCSIsKhmer xmlUCSIsKhmer__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsKhmerSymbols) xmlUCSIsKhmerSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsKhmerSymbols) xmlUCSIsKhmerSymbols __attribute((alias("xmlUCSIsKhmerSymbols__internal_alias")));
 #define xmlUCSIsKhmerSymbols xmlUCSIsKhmerSymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLao) xmlUCSIsLao__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLao) xmlUCSIsLao __attribute((alias("xmlUCSIsLao__internal_alias")));
 #define xmlUCSIsLao xmlUCSIsLao__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLatin1Supplement) xmlUCSIsLatin1Supplement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLatin1Supplement) xmlUCSIsLatin1Supplement __attribute((alias("xmlUCSIsLatin1Supplement__internal_alias")));
 #define xmlUCSIsLatin1Supplement xmlUCSIsLatin1Supplement__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLatinExtendedA) xmlUCSIsLatinExtendedA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLatinExtendedA) xmlUCSIsLatinExtendedA __attribute((alias("xmlUCSIsLatinExtendedA__internal_alias")));
 #define xmlUCSIsLatinExtendedA xmlUCSIsLatinExtendedA__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLatinExtendedAdditional) xmlUCSIsLatinExtendedAdditional__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLatinExtendedAdditional) xmlUCSIsLatinExtendedAdditional __attribute((alias("xmlUCSIsLatinExtendedAdditional__internal_alias")));
 #define xmlUCSIsLatinExtendedAdditional xmlUCSIsLatinExtendedAdditional__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLatinExtendedB) xmlUCSIsLatinExtendedB__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLatinExtendedB) xmlUCSIsLatinExtendedB __attribute((alias("xmlUCSIsLatinExtendedB__internal_alias")));
 #define xmlUCSIsLatinExtendedB xmlUCSIsLatinExtendedB__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLetterlikeSymbols) xmlUCSIsLetterlikeSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLetterlikeSymbols) xmlUCSIsLetterlikeSymbols __attribute((alias("xmlUCSIsLetterlikeSymbols__internal_alias")));
 #define xmlUCSIsLetterlikeSymbols xmlUCSIsLetterlikeSymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLimbu) xmlUCSIsLimbu__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLimbu) xmlUCSIsLimbu __attribute((alias("xmlUCSIsLimbu__internal_alias")));
 #define xmlUCSIsLimbu xmlUCSIsLimbu__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLinearBIdeograms) xmlUCSIsLinearBIdeograms__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLinearBIdeograms) xmlUCSIsLinearBIdeograms __attribute((alias("xmlUCSIsLinearBIdeograms__internal_alias")));
 #define xmlUCSIsLinearBIdeograms xmlUCSIsLinearBIdeograms__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLinearBSyllabary) xmlUCSIsLinearBSyllabary__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLinearBSyllabary) xmlUCSIsLinearBSyllabary __attribute((alias("xmlUCSIsLinearBSyllabary__internal_alias")));
 #define xmlUCSIsLinearBSyllabary xmlUCSIsLinearBSyllabary__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsLowSurrogates) xmlUCSIsLowSurrogates__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsLowSurrogates) xmlUCSIsLowSurrogates __attribute((alias("xmlUCSIsLowSurrogates__internal_alias")));
 #define xmlUCSIsLowSurrogates xmlUCSIsLowSurrogates__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMalayalam) xmlUCSIsMalayalam__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMalayalam) xmlUCSIsMalayalam __attribute((alias("xmlUCSIsMalayalam__internal_alias")));
 #define xmlUCSIsMalayalam xmlUCSIsMalayalam__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMathematicalAlphanumericSymbols) xmlUCSIsMathematicalAlphanumericSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMathematicalAlphanumericSymbols) xmlUCSIsMathematicalAlphanumericSymbols __attribute((alias("xmlUCSIsMathematicalAlphanumericSymbols__internal_alias")));
 #define xmlUCSIsMathematicalAlphanumericSymbols xmlUCSIsMathematicalAlphanumericSymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMathematicalOperators) xmlUCSIsMathematicalOperators__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMathematicalOperators) xmlUCSIsMathematicalOperators __attribute((alias("xmlUCSIsMathematicalOperators__internal_alias")));
 #define xmlUCSIsMathematicalOperators xmlUCSIsMathematicalOperators__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMiscellaneousMathematicalSymbolsA) xmlUCSIsMiscellaneousMathematicalSymbolsA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMiscellaneousMathematicalSymbolsA) xmlUCSIsMiscellaneousMathematicalSymbolsA __attribute((alias("xmlUCSIsMiscellaneousMathematicalSymbolsA__internal_alias")));
 #define xmlUCSIsMiscellaneousMathematicalSymbolsA xmlUCSIsMiscellaneousMathematicalSymbolsA__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMiscellaneousMathematicalSymbolsB) xmlUCSIsMiscellaneousMathematicalSymbolsB__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMiscellaneousMathematicalSymbolsB) xmlUCSIsMiscellaneousMathematicalSymbolsB __attribute((alias("xmlUCSIsMiscellaneousMathematicalSymbolsB__internal_alias")));
 #define xmlUCSIsMiscellaneousMathematicalSymbolsB xmlUCSIsMiscellaneousMathematicalSymbolsB__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMiscellaneousSymbols) xmlUCSIsMiscellaneousSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMiscellaneousSymbols) xmlUCSIsMiscellaneousSymbols __attribute((alias("xmlUCSIsMiscellaneousSymbols__internal_alias")));
 #define xmlUCSIsMiscellaneousSymbols xmlUCSIsMiscellaneousSymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMiscellaneousSymbolsandArrows) xmlUCSIsMiscellaneousSymbolsandArrows__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMiscellaneousSymbolsandArrows) xmlUCSIsMiscellaneousSymbolsandArrows __attribute((alias("xmlUCSIsMiscellaneousSymbolsandArrows__internal_alias")));
 #define xmlUCSIsMiscellaneousSymbolsandArrows xmlUCSIsMiscellaneousSymbolsandArrows__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMiscellaneousTechnical) xmlUCSIsMiscellaneousTechnical__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMiscellaneousTechnical) xmlUCSIsMiscellaneousTechnical __attribute((alias("xmlUCSIsMiscellaneousTechnical__internal_alias")));
 #define xmlUCSIsMiscellaneousTechnical xmlUCSIsMiscellaneousTechnical__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMongolian) xmlUCSIsMongolian__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMongolian) xmlUCSIsMongolian __attribute((alias("xmlUCSIsMongolian__internal_alias")));
 #define xmlUCSIsMongolian xmlUCSIsMongolian__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMusicalSymbols) xmlUCSIsMusicalSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMusicalSymbols) xmlUCSIsMusicalSymbols __attribute((alias("xmlUCSIsMusicalSymbols__internal_alias")));
 #define xmlUCSIsMusicalSymbols xmlUCSIsMusicalSymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsMyanmar) xmlUCSIsMyanmar__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsMyanmar) xmlUCSIsMyanmar __attribute((alias("xmlUCSIsMyanmar__internal_alias")));
 #define xmlUCSIsMyanmar xmlUCSIsMyanmar__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsNumberForms) xmlUCSIsNumberForms__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsNumberForms) xmlUCSIsNumberForms __attribute((alias("xmlUCSIsNumberForms__internal_alias")));
 #define xmlUCSIsNumberForms xmlUCSIsNumberForms__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsOgham) xmlUCSIsOgham__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsOgham) xmlUCSIsOgham __attribute((alias("xmlUCSIsOgham__internal_alias")));
 #define xmlUCSIsOgham xmlUCSIsOgham__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsOldItalic) xmlUCSIsOldItalic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsOldItalic) xmlUCSIsOldItalic __attribute((alias("xmlUCSIsOldItalic__internal_alias")));
 #define xmlUCSIsOldItalic xmlUCSIsOldItalic__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsOpticalCharacterRecognition) xmlUCSIsOpticalCharacterRecognition__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsOpticalCharacterRecognition) xmlUCSIsOpticalCharacterRecognition __attribute((alias("xmlUCSIsOpticalCharacterRecognition__internal_alias")));
 #define xmlUCSIsOpticalCharacterRecognition xmlUCSIsOpticalCharacterRecognition__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsOriya) xmlUCSIsOriya__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsOriya) xmlUCSIsOriya __attribute((alias("xmlUCSIsOriya__internal_alias")));
 #define xmlUCSIsOriya xmlUCSIsOriya__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsOsmanya) xmlUCSIsOsmanya__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsOsmanya) xmlUCSIsOsmanya __attribute((alias("xmlUCSIsOsmanya__internal_alias")));
 #define xmlUCSIsOsmanya xmlUCSIsOsmanya__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsPhoneticExtensions) xmlUCSIsPhoneticExtensions__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsPhoneticExtensions) xmlUCSIsPhoneticExtensions __attribute((alias("xmlUCSIsPhoneticExtensions__internal_alias")));
 #define xmlUCSIsPhoneticExtensions xmlUCSIsPhoneticExtensions__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsPrivateUse) xmlUCSIsPrivateUse__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsPrivateUse) xmlUCSIsPrivateUse __attribute((alias("xmlUCSIsPrivateUse__internal_alias")));
 #define xmlUCSIsPrivateUse xmlUCSIsPrivateUse__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsPrivateUseArea) xmlUCSIsPrivateUseArea__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsPrivateUseArea) xmlUCSIsPrivateUseArea __attribute((alias("xmlUCSIsPrivateUseArea__internal_alias")));
 #define xmlUCSIsPrivateUseArea xmlUCSIsPrivateUseArea__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsRunic) xmlUCSIsRunic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsRunic) xmlUCSIsRunic __attribute((alias("xmlUCSIsRunic__internal_alias")));
 #define xmlUCSIsRunic xmlUCSIsRunic__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsShavian) xmlUCSIsShavian__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsShavian) xmlUCSIsShavian __attribute((alias("xmlUCSIsShavian__internal_alias")));
 #define xmlUCSIsShavian xmlUCSIsShavian__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSinhala) xmlUCSIsSinhala__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSinhala) xmlUCSIsSinhala __attribute((alias("xmlUCSIsSinhala__internal_alias")));
 #define xmlUCSIsSinhala xmlUCSIsSinhala__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSmallFormVariants) xmlUCSIsSmallFormVariants__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSmallFormVariants) xmlUCSIsSmallFormVariants __attribute((alias("xmlUCSIsSmallFormVariants__internal_alias")));
 #define xmlUCSIsSmallFormVariants xmlUCSIsSmallFormVariants__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSpacingModifierLetters) xmlUCSIsSpacingModifierLetters__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSpacingModifierLetters) xmlUCSIsSpacingModifierLetters __attribute((alias("xmlUCSIsSpacingModifierLetters__internal_alias")));
 #define xmlUCSIsSpacingModifierLetters xmlUCSIsSpacingModifierLetters__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSpecials) xmlUCSIsSpecials__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSpecials) xmlUCSIsSpecials __attribute((alias("xmlUCSIsSpecials__internal_alias")));
 #define xmlUCSIsSpecials xmlUCSIsSpecials__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSuperscriptsandSubscripts) xmlUCSIsSuperscriptsandSubscripts__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSuperscriptsandSubscripts) xmlUCSIsSuperscriptsandSubscripts __attribute((alias("xmlUCSIsSuperscriptsandSubscripts__internal_alias")));
 #define xmlUCSIsSuperscriptsandSubscripts xmlUCSIsSuperscriptsandSubscripts__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSupplementalArrowsA) xmlUCSIsSupplementalArrowsA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSupplementalArrowsA) xmlUCSIsSupplementalArrowsA __attribute((alias("xmlUCSIsSupplementalArrowsA__internal_alias")));
 #define xmlUCSIsSupplementalArrowsA xmlUCSIsSupplementalArrowsA__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSupplementalArrowsB) xmlUCSIsSupplementalArrowsB__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSupplementalArrowsB) xmlUCSIsSupplementalArrowsB __attribute((alias("xmlUCSIsSupplementalArrowsB__internal_alias")));
 #define xmlUCSIsSupplementalArrowsB xmlUCSIsSupplementalArrowsB__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSupplementalMathematicalOperators) xmlUCSIsSupplementalMathematicalOperators__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSupplementalMathematicalOperators) xmlUCSIsSupplementalMathematicalOperators __attribute((alias("xmlUCSIsSupplementalMathematicalOperators__internal_alias")));
 #define xmlUCSIsSupplementalMathematicalOperators xmlUCSIsSupplementalMathematicalOperators__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSupplementaryPrivateUseAreaA) xmlUCSIsSupplementaryPrivateUseAreaA__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSupplementaryPrivateUseAreaA) xmlUCSIsSupplementaryPrivateUseAreaA __attribute((alias("xmlUCSIsSupplementaryPrivateUseAreaA__internal_alias")));
 #define xmlUCSIsSupplementaryPrivateUseAreaA xmlUCSIsSupplementaryPrivateUseAreaA__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSupplementaryPrivateUseAreaB) xmlUCSIsSupplementaryPrivateUseAreaB__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSupplementaryPrivateUseAreaB) xmlUCSIsSupplementaryPrivateUseAreaB __attribute((alias("xmlUCSIsSupplementaryPrivateUseAreaB__internal_alias")));
 #define xmlUCSIsSupplementaryPrivateUseAreaB xmlUCSIsSupplementaryPrivateUseAreaB__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsSyriac) xmlUCSIsSyriac__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsSyriac) xmlUCSIsSyriac __attribute((alias("xmlUCSIsSyriac__internal_alias")));
 #define xmlUCSIsSyriac xmlUCSIsSyriac__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsTagalog) xmlUCSIsTagalog__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsTagalog) xmlUCSIsTagalog __attribute((alias("xmlUCSIsTagalog__internal_alias")));
 #define xmlUCSIsTagalog xmlUCSIsTagalog__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsTagbanwa) xmlUCSIsTagbanwa__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsTagbanwa) xmlUCSIsTagbanwa __attribute((alias("xmlUCSIsTagbanwa__internal_alias")));
 #define xmlUCSIsTagbanwa xmlUCSIsTagbanwa__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsTags) xmlUCSIsTags__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsTags) xmlUCSIsTags __attribute((alias("xmlUCSIsTags__internal_alias")));
 #define xmlUCSIsTags xmlUCSIsTags__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsTaiLe) xmlUCSIsTaiLe__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsTaiLe) xmlUCSIsTaiLe __attribute((alias("xmlUCSIsTaiLe__internal_alias")));
 #define xmlUCSIsTaiLe xmlUCSIsTaiLe__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsTaiXuanJingSymbols) xmlUCSIsTaiXuanJingSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsTaiXuanJingSymbols) xmlUCSIsTaiXuanJingSymbols __attribute((alias("xmlUCSIsTaiXuanJingSymbols__internal_alias")));
 #define xmlUCSIsTaiXuanJingSymbols xmlUCSIsTaiXuanJingSymbols__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsTamil) xmlUCSIsTamil__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsTamil) xmlUCSIsTamil __attribute((alias("xmlUCSIsTamil__internal_alias")));
 #define xmlUCSIsTamil xmlUCSIsTamil__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsTelugu) xmlUCSIsTelugu__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsTelugu) xmlUCSIsTelugu __attribute((alias("xmlUCSIsTelugu__internal_alias")));
 #define xmlUCSIsTelugu xmlUCSIsTelugu__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsThaana) xmlUCSIsThaana__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsThaana) xmlUCSIsThaana __attribute((alias("xmlUCSIsThaana__internal_alias")));
 #define xmlUCSIsThaana xmlUCSIsThaana__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsThai) xmlUCSIsThai__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsThai) xmlUCSIsThai __attribute((alias("xmlUCSIsThai__internal_alias")));
 #define xmlUCSIsThai xmlUCSIsThai__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsTibetan) xmlUCSIsTibetan__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsTibetan) xmlUCSIsTibetan __attribute((alias("xmlUCSIsTibetan__internal_alias")));
 #define xmlUCSIsTibetan xmlUCSIsTibetan__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsUgaritic) xmlUCSIsUgaritic__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsUgaritic) xmlUCSIsUgaritic __attribute((alias("xmlUCSIsUgaritic__internal_alias")));
 #define xmlUCSIsUgaritic xmlUCSIsUgaritic__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsUnifiedCanadianAboriginalSyllabics) xmlUCSIsUnifiedCanadianAboriginalSyllabics__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsUnifiedCanadianAboriginalSyllabics) xmlUCSIsUnifiedCanadianAboriginalSyllabics __attribute((alias("xmlUCSIsUnifiedCanadianAboriginalSyllabics__internal_alias")));
 #define xmlUCSIsUnifiedCanadianAboriginalSyllabics xmlUCSIsUnifiedCanadianAboriginalSyllabics__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsVariationSelectors) xmlUCSIsVariationSelectors__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsVariationSelectors) xmlUCSIsVariationSelectors __attribute((alias("xmlUCSIsVariationSelectors__internal_alias")));
 #define xmlUCSIsVariationSelectors xmlUCSIsVariationSelectors__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsVariationSelectorsSupplement) xmlUCSIsVariationSelectorsSupplement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsVariationSelectorsSupplement) xmlUCSIsVariationSelectorsSupplement __attribute((alias("xmlUCSIsVariationSelectorsSupplement__internal_alias")));
 #define xmlUCSIsVariationSelectorsSupplement xmlUCSIsVariationSelectorsSupplement__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsYiRadicals) xmlUCSIsYiRadicals__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsYiRadicals) xmlUCSIsYiRadicals __attribute((alias("xmlUCSIsYiRadicals__internal_alias")));
 #define xmlUCSIsYiRadicals xmlUCSIsYiRadicals__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsYiSyllables) xmlUCSIsYiSyllables__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsYiSyllables) xmlUCSIsYiSyllables __attribute((alias("xmlUCSIsYiSyllables__internal_alias")));
 #define xmlUCSIsYiSyllables xmlUCSIsYiSyllables__internal_alias
 #endif
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
 extern __typeof (xmlUCSIsYijingHexagramSymbols) xmlUCSIsYijingHexagramSymbols__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUCSIsYijingHexagramSymbols) xmlUCSIsYijingHexagramSymbols __attribute((alias("xmlUCSIsYijingHexagramSymbols__internal_alias")));
 #define xmlUCSIsYijingHexagramSymbols xmlUCSIsYijingHexagramSymbols__internal_alias
@@ -6374,1265 +6426,1273 @@ extern __typeof (xmlUnlockLibrary) xmlUnlockLibrary__internal_alias __attribute(
 extern __typeof (xmlUnlockLibrary) xmlUnlockLibrary __attribute((alias("xmlUnlockLibrary__internal_alias")));
 #define xmlUnlockLibrary xmlUnlockLibrary__internal_alias
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlUnsetNsProp) xmlUnsetNsProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUnsetNsProp) xmlUnsetNsProp __attribute((alias("xmlUnsetNsProp__internal_alias")));
 #define xmlUnsetNsProp xmlUnsetNsProp__internal_alias
 #endif
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlUnsetProp) xmlUnsetProp__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlUnsetProp) xmlUnsetProp __attribute((alias("xmlUnsetProp__internal_alias")));
 #define xmlUnsetProp xmlUnsetProp__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlValidBuildContentModel) xmlValidBuildContentModel__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidBuildContentModel) xmlValidBuildContentModel __attribute((alias("xmlValidBuildContentModel__internal_alias")));
 #define xmlValidBuildContentModel xmlValidBuildContentModel__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidCtxtNormalizeAttributeValue) xmlValidCtxtNormalizeAttributeValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidCtxtNormalizeAttributeValue) xmlValidCtxtNormalizeAttributeValue __attribute((alias("xmlValidCtxtNormalizeAttributeValue__internal_alias")));
 #define xmlValidCtxtNormalizeAttributeValue xmlValidCtxtNormalizeAttributeValue__internal_alias
 #endif
 
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidGetPotentialChildren) xmlValidGetPotentialChildren__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidGetPotentialChildren) xmlValidGetPotentialChildren __attribute((alias("xmlValidGetPotentialChildren__internal_alias")));
 #define xmlValidGetPotentialChildren xmlValidGetPotentialChildren__internal_alias
+#endif
 
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidGetValidElements) xmlValidGetValidElements__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidGetValidElements) xmlValidGetValidElements __attribute((alias("xmlValidGetValidElements__internal_alias")));
 #define xmlValidGetValidElements xmlValidGetValidElements__internal_alias
+#endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidNormalizeAttributeValue) xmlValidNormalizeAttributeValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidNormalizeAttributeValue) xmlValidNormalizeAttributeValue __attribute((alias("xmlValidNormalizeAttributeValue__internal_alias")));
 #define xmlValidNormalizeAttributeValue xmlValidNormalizeAttributeValue__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateAttributeDecl) xmlValidateAttributeDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateAttributeDecl) xmlValidateAttributeDecl __attribute((alias("xmlValidateAttributeDecl__internal_alias")));
 #define xmlValidateAttributeDecl xmlValidateAttributeDecl__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateAttributeValue) xmlValidateAttributeValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateAttributeValue) xmlValidateAttributeValue __attribute((alias("xmlValidateAttributeValue__internal_alias")));
 #define xmlValidateAttributeValue xmlValidateAttributeValue__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateDocument) xmlValidateDocument__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateDocument) xmlValidateDocument __attribute((alias("xmlValidateDocument__internal_alias")));
 #define xmlValidateDocument xmlValidateDocument__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateDocumentFinal) xmlValidateDocumentFinal__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateDocumentFinal) xmlValidateDocumentFinal __attribute((alias("xmlValidateDocumentFinal__internal_alias")));
 #define xmlValidateDocumentFinal xmlValidateDocumentFinal__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateDtd) xmlValidateDtd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateDtd) xmlValidateDtd __attribute((alias("xmlValidateDtd__internal_alias")));
 #define xmlValidateDtd xmlValidateDtd__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateDtdFinal) xmlValidateDtdFinal__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateDtdFinal) xmlValidateDtdFinal __attribute((alias("xmlValidateDtdFinal__internal_alias")));
 #define xmlValidateDtdFinal xmlValidateDtdFinal__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateElement) xmlValidateElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateElement) xmlValidateElement __attribute((alias("xmlValidateElement__internal_alias")));
 #define xmlValidateElement xmlValidateElement__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateElementDecl) xmlValidateElementDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateElementDecl) xmlValidateElementDecl __attribute((alias("xmlValidateElementDecl__internal_alias")));
 #define xmlValidateElementDecl xmlValidateElementDecl__internal_alias
 #endif
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlValidateNCName) xmlValidateNCName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateNCName) xmlValidateNCName __attribute((alias("xmlValidateNCName__internal_alias")));
 #define xmlValidateNCName xmlValidateNCName__internal_alias
+#endif
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlValidateNMToken) xmlValidateNMToken__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateNMToken) xmlValidateNMToken __attribute((alias("xmlValidateNMToken__internal_alias")));
 #define xmlValidateNMToken xmlValidateNMToken__internal_alias
+#endif
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlValidateName) xmlValidateName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateName) xmlValidateName __attribute((alias("xmlValidateName__internal_alias")));
 #define xmlValidateName xmlValidateName__internal_alias
+#endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateNameValue) xmlValidateNameValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateNameValue) xmlValidateNameValue __attribute((alias("xmlValidateNameValue__internal_alias")));
 #define xmlValidateNameValue xmlValidateNameValue__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateNamesValue) xmlValidateNamesValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateNamesValue) xmlValidateNamesValue __attribute((alias("xmlValidateNamesValue__internal_alias")));
 #define xmlValidateNamesValue xmlValidateNamesValue__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateNmtokenValue) xmlValidateNmtokenValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateNmtokenValue) xmlValidateNmtokenValue __attribute((alias("xmlValidateNmtokenValue__internal_alias")));
 #define xmlValidateNmtokenValue xmlValidateNmtokenValue__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateNmtokensValue) xmlValidateNmtokensValue__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateNmtokensValue) xmlValidateNmtokensValue __attribute((alias("xmlValidateNmtokensValue__internal_alias")));
 #define xmlValidateNmtokensValue xmlValidateNmtokensValue__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateNotationDecl) xmlValidateNotationDecl__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateNotationDecl) xmlValidateNotationDecl __attribute((alias("xmlValidateNotationDecl__internal_alias")));
 #define xmlValidateNotationDecl xmlValidateNotationDecl__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlValidateNotationUse) xmlValidateNotationUse__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateNotationUse) xmlValidateNotationUse __attribute((alias("xmlValidateNotationUse__internal_alias")));
 #define xmlValidateNotationUse xmlValidateNotationUse__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateOneAttribute) xmlValidateOneAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateOneAttribute) xmlValidateOneAttribute __attribute((alias("xmlValidateOneAttribute__internal_alias")));
 #define xmlValidateOneAttribute xmlValidateOneAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateOneElement) xmlValidateOneElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateOneElement) xmlValidateOneElement __attribute((alias("xmlValidateOneElement__internal_alias")));
 #define xmlValidateOneElement xmlValidateOneElement__internal_alias
 #endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateOneNamespace) xmlValidateOneNamespace__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateOneNamespace) xmlValidateOneNamespace __attribute((alias("xmlValidateOneNamespace__internal_alias")));
 #define xmlValidateOneNamespace xmlValidateOneNamespace__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlValidatePopElement) xmlValidatePopElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidatePopElement) xmlValidatePopElement __attribute((alias("xmlValidatePopElement__internal_alias")));
 #define xmlValidatePopElement xmlValidatePopElement__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlValidatePushCData) xmlValidatePushCData__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidatePushCData) xmlValidatePushCData __attribute((alias("xmlValidatePushCData__internal_alias")));
 #define xmlValidatePushCData xmlValidatePushCData__internal_alias
 #endif
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
 extern __typeof (xmlValidatePushElement) xmlValidatePushElement__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidatePushElement) xmlValidatePushElement __attribute((alias("xmlValidatePushElement__internal_alias")));
 #define xmlValidatePushElement xmlValidatePushElement__internal_alias
 #endif
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlValidateQName) xmlValidateQName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateQName) xmlValidateQName __attribute((alias("xmlValidateQName__internal_alias")));
 #define xmlValidateQName xmlValidateQName__internal_alias
+#endif
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
 extern __typeof (xmlValidateRoot) xmlValidateRoot__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlValidateRoot) xmlValidateRoot __attribute((alias("xmlValidateRoot__internal_alias")));
 #define xmlValidateRoot xmlValidateRoot__internal_alias
 #endif
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
 extern __typeof (xmlXIncludeFreeContext) xmlXIncludeFreeContext__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXIncludeFreeContext) xmlXIncludeFreeContext __attribute((alias("xmlXIncludeFreeContext__internal_alias")));
 #define xmlXIncludeFreeContext xmlXIncludeFreeContext__internal_alias
 #endif
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
 extern __typeof (xmlXIncludeNewContext) xmlXIncludeNewContext__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXIncludeNewContext) xmlXIncludeNewContext __attribute((alias("xmlXIncludeNewContext__internal_alias")));
 #define xmlXIncludeNewContext xmlXIncludeNewContext__internal_alias
 #endif
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
 extern __typeof (xmlXIncludeProcess) xmlXIncludeProcess__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXIncludeProcess) xmlXIncludeProcess __attribute((alias("xmlXIncludeProcess__internal_alias")));
 #define xmlXIncludeProcess xmlXIncludeProcess__internal_alias
 #endif
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
 extern __typeof (xmlXIncludeProcessFlags) xmlXIncludeProcessFlags__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXIncludeProcessFlags) xmlXIncludeProcessFlags __attribute((alias("xmlXIncludeProcessFlags__internal_alias")));
 #define xmlXIncludeProcessFlags xmlXIncludeProcessFlags__internal_alias
 #endif
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
 extern __typeof (xmlXIncludeProcessNode) xmlXIncludeProcessNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXIncludeProcessNode) xmlXIncludeProcessNode __attribute((alias("xmlXIncludeProcessNode__internal_alias")));
 #define xmlXIncludeProcessNode xmlXIncludeProcessNode__internal_alias
 #endif
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
 extern __typeof (xmlXIncludeProcessTree) xmlXIncludeProcessTree__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXIncludeProcessTree) xmlXIncludeProcessTree __attribute((alias("xmlXIncludeProcessTree__internal_alias")));
 #define xmlXIncludeProcessTree xmlXIncludeProcessTree__internal_alias
 #endif
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
 extern __typeof (xmlXIncludeProcessTreeFlags) xmlXIncludeProcessTreeFlags__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXIncludeProcessTreeFlags) xmlXIncludeProcessTreeFlags __attribute((alias("xmlXIncludeProcessTreeFlags__internal_alias")));
 #define xmlXIncludeProcessTreeFlags xmlXIncludeProcessTreeFlags__internal_alias
 #endif
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
 extern __typeof (xmlXIncludeSetFlags) xmlXIncludeSetFlags__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXIncludeSetFlags) xmlXIncludeSetFlags __attribute((alias("xmlXIncludeSetFlags__internal_alias")));
 #define xmlXIncludeSetFlags xmlXIncludeSetFlags__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathAddValues) xmlXPathAddValues__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathAddValues) xmlXPathAddValues __attribute((alias("xmlXPathAddValues__internal_alias")));
 #define xmlXPathAddValues xmlXPathAddValues__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathBooleanFunction) xmlXPathBooleanFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathBooleanFunction) xmlXPathBooleanFunction __attribute((alias("xmlXPathBooleanFunction__internal_alias")));
 #define xmlXPathBooleanFunction xmlXPathBooleanFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastBooleanToNumber) xmlXPathCastBooleanToNumber__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastBooleanToNumber) xmlXPathCastBooleanToNumber __attribute((alias("xmlXPathCastBooleanToNumber__internal_alias")));
 #define xmlXPathCastBooleanToNumber xmlXPathCastBooleanToNumber__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastBooleanToString) xmlXPathCastBooleanToString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastBooleanToString) xmlXPathCastBooleanToString __attribute((alias("xmlXPathCastBooleanToString__internal_alias")));
 #define xmlXPathCastBooleanToString xmlXPathCastBooleanToString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastNodeSetToBoolean) xmlXPathCastNodeSetToBoolean__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastNodeSetToBoolean) xmlXPathCastNodeSetToBoolean __attribute((alias("xmlXPathCastNodeSetToBoolean__internal_alias")));
 #define xmlXPathCastNodeSetToBoolean xmlXPathCastNodeSetToBoolean__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastNodeSetToNumber) xmlXPathCastNodeSetToNumber__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastNodeSetToNumber) xmlXPathCastNodeSetToNumber __attribute((alias("xmlXPathCastNodeSetToNumber__internal_alias")));
 #define xmlXPathCastNodeSetToNumber xmlXPathCastNodeSetToNumber__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastNodeSetToString) xmlXPathCastNodeSetToString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastNodeSetToString) xmlXPathCastNodeSetToString __attribute((alias("xmlXPathCastNodeSetToString__internal_alias")));
 #define xmlXPathCastNodeSetToString xmlXPathCastNodeSetToString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastNodeToNumber) xmlXPathCastNodeToNumber__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastNodeToNumber) xmlXPathCastNodeToNumber __attribute((alias("xmlXPathCastNodeToNumber__internal_alias")));
 #define xmlXPathCastNodeToNumber xmlXPathCastNodeToNumber__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastNodeToString) xmlXPathCastNodeToString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastNodeToString) xmlXPathCastNodeToString __attribute((alias("xmlXPathCastNodeToString__internal_alias")));
 #define xmlXPathCastNodeToString xmlXPathCastNodeToString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastNumberToBoolean) xmlXPathCastNumberToBoolean__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastNumberToBoolean) xmlXPathCastNumberToBoolean __attribute((alias("xmlXPathCastNumberToBoolean__internal_alias")));
 #define xmlXPathCastNumberToBoolean xmlXPathCastNumberToBoolean__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastNumberToString) xmlXPathCastNumberToString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastNumberToString) xmlXPathCastNumberToString __attribute((alias("xmlXPathCastNumberToString__internal_alias")));
 #define xmlXPathCastNumberToString xmlXPathCastNumberToString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastStringToBoolean) xmlXPathCastStringToBoolean__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastStringToBoolean) xmlXPathCastStringToBoolean __attribute((alias("xmlXPathCastStringToBoolean__internal_alias")));
 #define xmlXPathCastStringToBoolean xmlXPathCastStringToBoolean__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastStringToNumber) xmlXPathCastStringToNumber__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastStringToNumber) xmlXPathCastStringToNumber __attribute((alias("xmlXPathCastStringToNumber__internal_alias")));
 #define xmlXPathCastStringToNumber xmlXPathCastStringToNumber__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastToBoolean) xmlXPathCastToBoolean__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastToBoolean) xmlXPathCastToBoolean __attribute((alias("xmlXPathCastToBoolean__internal_alias")));
 #define xmlXPathCastToBoolean xmlXPathCastToBoolean__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastToNumber) xmlXPathCastToNumber__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastToNumber) xmlXPathCastToNumber __attribute((alias("xmlXPathCastToNumber__internal_alias")));
 #define xmlXPathCastToNumber xmlXPathCastToNumber__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCastToString) xmlXPathCastToString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCastToString) xmlXPathCastToString __attribute((alias("xmlXPathCastToString__internal_alias")));
 #define xmlXPathCastToString xmlXPathCastToString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCeilingFunction) xmlXPathCeilingFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCeilingFunction) xmlXPathCeilingFunction __attribute((alias("xmlXPathCeilingFunction__internal_alias")));
 #define xmlXPathCeilingFunction xmlXPathCeilingFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCmpNodes) xmlXPathCmpNodes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCmpNodes) xmlXPathCmpNodes __attribute((alias("xmlXPathCmpNodes__internal_alias")));
 #define xmlXPathCmpNodes xmlXPathCmpNodes__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCompareValues) xmlXPathCompareValues__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCompareValues) xmlXPathCompareValues __attribute((alias("xmlXPathCompareValues__internal_alias")));
 #define xmlXPathCompareValues xmlXPathCompareValues__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCompile) xmlXPathCompile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCompile) xmlXPathCompile __attribute((alias("xmlXPathCompile__internal_alias")));
 #define xmlXPathCompile xmlXPathCompile__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCompiledEval) xmlXPathCompiledEval__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCompiledEval) xmlXPathCompiledEval __attribute((alias("xmlXPathCompiledEval__internal_alias")));
 #define xmlXPathCompiledEval xmlXPathCompiledEval__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathConcatFunction) xmlXPathConcatFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathConcatFunction) xmlXPathConcatFunction __attribute((alias("xmlXPathConcatFunction__internal_alias")));
 #define xmlXPathConcatFunction xmlXPathConcatFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathContainsFunction) xmlXPathContainsFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathContainsFunction) xmlXPathContainsFunction __attribute((alias("xmlXPathContainsFunction__internal_alias")));
 #define xmlXPathContainsFunction xmlXPathContainsFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathConvertBoolean) xmlXPathConvertBoolean__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathConvertBoolean) xmlXPathConvertBoolean __attribute((alias("xmlXPathConvertBoolean__internal_alias")));
 #define xmlXPathConvertBoolean xmlXPathConvertBoolean__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathConvertNumber) xmlXPathConvertNumber__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathConvertNumber) xmlXPathConvertNumber __attribute((alias("xmlXPathConvertNumber__internal_alias")));
 #define xmlXPathConvertNumber xmlXPathConvertNumber__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathConvertString) xmlXPathConvertString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathConvertString) xmlXPathConvertString __attribute((alias("xmlXPathConvertString__internal_alias")));
 #define xmlXPathConvertString xmlXPathConvertString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCountFunction) xmlXPathCountFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCountFunction) xmlXPathCountFunction __attribute((alias("xmlXPathCountFunction__internal_alias")));
 #define xmlXPathCountFunction xmlXPathCountFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathCtxtCompile) xmlXPathCtxtCompile__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathCtxtCompile) xmlXPathCtxtCompile __attribute((alias("xmlXPathCtxtCompile__internal_alias")));
 #define xmlXPathCtxtCompile xmlXPathCtxtCompile__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlXPathDebugDumpCompExpr) xmlXPathDebugDumpCompExpr__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathDebugDumpCompExpr) xmlXPathDebugDumpCompExpr __attribute((alias("xmlXPathDebugDumpCompExpr__internal_alias")));
 #define xmlXPathDebugDumpCompExpr xmlXPathDebugDumpCompExpr__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_XPATH_ENABLED
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_DEBUG_ENABLED)
 extern __typeof (xmlXPathDebugDumpObject) xmlXPathDebugDumpObject__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathDebugDumpObject) xmlXPathDebugDumpObject __attribute((alias("xmlXPathDebugDumpObject__internal_alias")));
 #define xmlXPathDebugDumpObject xmlXPathDebugDumpObject__internal_alias
 #endif
-#endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathDifference) xmlXPathDifference__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathDifference) xmlXPathDifference __attribute((alias("xmlXPathDifference__internal_alias")));
 #define xmlXPathDifference xmlXPathDifference__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathDistinct) xmlXPathDistinct__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathDistinct) xmlXPathDistinct __attribute((alias("xmlXPathDistinct__internal_alias")));
 #define xmlXPathDistinct xmlXPathDistinct__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathDistinctSorted) xmlXPathDistinctSorted__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathDistinctSorted) xmlXPathDistinctSorted __attribute((alias("xmlXPathDistinctSorted__internal_alias")));
 #define xmlXPathDistinctSorted xmlXPathDistinctSorted__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathDivValues) xmlXPathDivValues__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathDivValues) xmlXPathDivValues __attribute((alias("xmlXPathDivValues__internal_alias")));
 #define xmlXPathDivValues xmlXPathDivValues__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathEqualValues) xmlXPathEqualValues__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathEqualValues) xmlXPathEqualValues __attribute((alias("xmlXPathEqualValues__internal_alias")));
 #define xmlXPathEqualValues xmlXPathEqualValues__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathErr) xmlXPathErr__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathErr) xmlXPathErr __attribute((alias("xmlXPathErr__internal_alias")));
 #define xmlXPathErr xmlXPathErr__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathEval) xmlXPathEval__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathEval) xmlXPathEval __attribute((alias("xmlXPathEval__internal_alias")));
 #define xmlXPathEval xmlXPathEval__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathEvalExpr) xmlXPathEvalExpr__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathEvalExpr) xmlXPathEvalExpr __attribute((alias("xmlXPathEvalExpr__internal_alias")));
 #define xmlXPathEvalExpr xmlXPathEvalExpr__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathEvalExpression) xmlXPathEvalExpression__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathEvalExpression) xmlXPathEvalExpression __attribute((alias("xmlXPathEvalExpression__internal_alias")));
 #define xmlXPathEvalExpression xmlXPathEvalExpression__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathEvalPredicate) xmlXPathEvalPredicate__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathEvalPredicate) xmlXPathEvalPredicate __attribute((alias("xmlXPathEvalPredicate__internal_alias")));
 #define xmlXPathEvalPredicate xmlXPathEvalPredicate__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathEvaluatePredicateResult) xmlXPathEvaluatePredicateResult__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathEvaluatePredicateResult) xmlXPathEvaluatePredicateResult __attribute((alias("xmlXPathEvaluatePredicateResult__internal_alias")));
 #define xmlXPathEvaluatePredicateResult xmlXPathEvaluatePredicateResult__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFalseFunction) xmlXPathFalseFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFalseFunction) xmlXPathFalseFunction __attribute((alias("xmlXPathFalseFunction__internal_alias")));
 #define xmlXPathFalseFunction xmlXPathFalseFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFloorFunction) xmlXPathFloorFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFloorFunction) xmlXPathFloorFunction __attribute((alias("xmlXPathFloorFunction__internal_alias")));
 #define xmlXPathFloorFunction xmlXPathFloorFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFreeCompExpr) xmlXPathFreeCompExpr__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFreeCompExpr) xmlXPathFreeCompExpr __attribute((alias("xmlXPathFreeCompExpr__internal_alias")));
 #define xmlXPathFreeCompExpr xmlXPathFreeCompExpr__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFreeContext) xmlXPathFreeContext__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFreeContext) xmlXPathFreeContext __attribute((alias("xmlXPathFreeContext__internal_alias")));
 #define xmlXPathFreeContext xmlXPathFreeContext__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFreeNodeSet) xmlXPathFreeNodeSet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFreeNodeSet) xmlXPathFreeNodeSet __attribute((alias("xmlXPathFreeNodeSet__internal_alias")));
 #define xmlXPathFreeNodeSet xmlXPathFreeNodeSet__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFreeNodeSetList) xmlXPathFreeNodeSetList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFreeNodeSetList) xmlXPathFreeNodeSetList __attribute((alias("xmlXPathFreeNodeSetList__internal_alias")));
 #define xmlXPathFreeNodeSetList xmlXPathFreeNodeSetList__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFreeObject) xmlXPathFreeObject__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFreeObject) xmlXPathFreeObject __attribute((alias("xmlXPathFreeObject__internal_alias")));
 #define xmlXPathFreeObject xmlXPathFreeObject__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFreeParserContext) xmlXPathFreeParserContext__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFreeParserContext) xmlXPathFreeParserContext __attribute((alias("xmlXPathFreeParserContext__internal_alias")));
 #define xmlXPathFreeParserContext xmlXPathFreeParserContext__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFunctionLookup) xmlXPathFunctionLookup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFunctionLookup) xmlXPathFunctionLookup __attribute((alias("xmlXPathFunctionLookup__internal_alias")));
 #define xmlXPathFunctionLookup xmlXPathFunctionLookup__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathFunctionLookupNS) xmlXPathFunctionLookupNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathFunctionLookupNS) xmlXPathFunctionLookupNS __attribute((alias("xmlXPathFunctionLookupNS__internal_alias")));
 #define xmlXPathFunctionLookupNS xmlXPathFunctionLookupNS__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathHasSameNodes) xmlXPathHasSameNodes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathHasSameNodes) xmlXPathHasSameNodes __attribute((alias("xmlXPathHasSameNodes__internal_alias")));
 #define xmlXPathHasSameNodes xmlXPathHasSameNodes__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathIdFunction) xmlXPathIdFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathIdFunction) xmlXPathIdFunction __attribute((alias("xmlXPathIdFunction__internal_alias")));
 #define xmlXPathIdFunction xmlXPathIdFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlXPathInit) xmlXPathInit__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathInit) xmlXPathInit __attribute((alias("xmlXPathInit__internal_alias")));
 #define xmlXPathInit xmlXPathInit__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathIntersection) xmlXPathIntersection__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathIntersection) xmlXPathIntersection __attribute((alias("xmlXPathIntersection__internal_alias")));
 #define xmlXPathIntersection xmlXPathIntersection__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlXPathIsInf) xmlXPathIsInf__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathIsInf) xmlXPathIsInf __attribute((alias("xmlXPathIsInf__internal_alias")));
 #define xmlXPathIsInf xmlXPathIsInf__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 extern __typeof (xmlXPathIsNaN) xmlXPathIsNaN__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathIsNaN) xmlXPathIsNaN __attribute((alias("xmlXPathIsNaN__internal_alias")));
 #define xmlXPathIsNaN xmlXPathIsNaN__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathIsNodeType) xmlXPathIsNodeType__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathIsNodeType) xmlXPathIsNodeType __attribute((alias("xmlXPathIsNodeType__internal_alias")));
 #define xmlXPathIsNodeType xmlXPathIsNodeType__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathLangFunction) xmlXPathLangFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathLangFunction) xmlXPathLangFunction __attribute((alias("xmlXPathLangFunction__internal_alias")));
 #define xmlXPathLangFunction xmlXPathLangFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathLastFunction) xmlXPathLastFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathLastFunction) xmlXPathLastFunction __attribute((alias("xmlXPathLastFunction__internal_alias")));
 #define xmlXPathLastFunction xmlXPathLastFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathLeading) xmlXPathLeading__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathLeading) xmlXPathLeading __attribute((alias("xmlXPathLeading__internal_alias")));
 #define xmlXPathLeading xmlXPathLeading__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathLeadingSorted) xmlXPathLeadingSorted__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathLeadingSorted) xmlXPathLeadingSorted __attribute((alias("xmlXPathLeadingSorted__internal_alias")));
 #define xmlXPathLeadingSorted xmlXPathLeadingSorted__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathLocalNameFunction) xmlXPathLocalNameFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathLocalNameFunction) xmlXPathLocalNameFunction __attribute((alias("xmlXPathLocalNameFunction__internal_alias")));
 #define xmlXPathLocalNameFunction xmlXPathLocalNameFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathModValues) xmlXPathModValues__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathModValues) xmlXPathModValues __attribute((alias("xmlXPathModValues__internal_alias")));
 #define xmlXPathModValues xmlXPathModValues__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathMultValues) xmlXPathMultValues__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathMultValues) xmlXPathMultValues __attribute((alias("xmlXPathMultValues__internal_alias")));
 #define xmlXPathMultValues xmlXPathMultValues__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNamespaceURIFunction) xmlXPathNamespaceURIFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNamespaceURIFunction) xmlXPathNamespaceURIFunction __attribute((alias("xmlXPathNamespaceURIFunction__internal_alias")));
 #define xmlXPathNamespaceURIFunction xmlXPathNamespaceURIFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNewBoolean) xmlXPathNewBoolean__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNewBoolean) xmlXPathNewBoolean __attribute((alias("xmlXPathNewBoolean__internal_alias")));
 #define xmlXPathNewBoolean xmlXPathNewBoolean__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNewCString) xmlXPathNewCString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNewCString) xmlXPathNewCString __attribute((alias("xmlXPathNewCString__internal_alias")));
 #define xmlXPathNewCString xmlXPathNewCString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNewContext) xmlXPathNewContext__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNewContext) xmlXPathNewContext __attribute((alias("xmlXPathNewContext__internal_alias")));
 #define xmlXPathNewContext xmlXPathNewContext__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNewFloat) xmlXPathNewFloat__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNewFloat) xmlXPathNewFloat __attribute((alias("xmlXPathNewFloat__internal_alias")));
 #define xmlXPathNewFloat xmlXPathNewFloat__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNewNodeSet) xmlXPathNewNodeSet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNewNodeSet) xmlXPathNewNodeSet __attribute((alias("xmlXPathNewNodeSet__internal_alias")));
 #define xmlXPathNewNodeSet xmlXPathNewNodeSet__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNewNodeSetList) xmlXPathNewNodeSetList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNewNodeSetList) xmlXPathNewNodeSetList __attribute((alias("xmlXPathNewNodeSetList__internal_alias")));
 #define xmlXPathNewNodeSetList xmlXPathNewNodeSetList__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNewParserContext) xmlXPathNewParserContext__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNewParserContext) xmlXPathNewParserContext __attribute((alias("xmlXPathNewParserContext__internal_alias")));
 #define xmlXPathNewParserContext xmlXPathNewParserContext__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNewString) xmlXPathNewString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNewString) xmlXPathNewString __attribute((alias("xmlXPathNewString__internal_alias")));
 #define xmlXPathNewString xmlXPathNewString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNewValueTree) xmlXPathNewValueTree__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNewValueTree) xmlXPathNewValueTree __attribute((alias("xmlXPathNewValueTree__internal_alias")));
 #define xmlXPathNewValueTree xmlXPathNewValueTree__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextAncestor) xmlXPathNextAncestor__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextAncestor) xmlXPathNextAncestor __attribute((alias("xmlXPathNextAncestor__internal_alias")));
 #define xmlXPathNextAncestor xmlXPathNextAncestor__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextAncestorOrSelf) xmlXPathNextAncestorOrSelf__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextAncestorOrSelf) xmlXPathNextAncestorOrSelf __attribute((alias("xmlXPathNextAncestorOrSelf__internal_alias")));
 #define xmlXPathNextAncestorOrSelf xmlXPathNextAncestorOrSelf__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextAttribute) xmlXPathNextAttribute__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextAttribute) xmlXPathNextAttribute __attribute((alias("xmlXPathNextAttribute__internal_alias")));
 #define xmlXPathNextAttribute xmlXPathNextAttribute__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextChild) xmlXPathNextChild__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextChild) xmlXPathNextChild __attribute((alias("xmlXPathNextChild__internal_alias")));
 #define xmlXPathNextChild xmlXPathNextChild__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextDescendant) xmlXPathNextDescendant__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextDescendant) xmlXPathNextDescendant __attribute((alias("xmlXPathNextDescendant__internal_alias")));
 #define xmlXPathNextDescendant xmlXPathNextDescendant__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextDescendantOrSelf) xmlXPathNextDescendantOrSelf__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextDescendantOrSelf) xmlXPathNextDescendantOrSelf __attribute((alias("xmlXPathNextDescendantOrSelf__internal_alias")));
 #define xmlXPathNextDescendantOrSelf xmlXPathNextDescendantOrSelf__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextFollowing) xmlXPathNextFollowing__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextFollowing) xmlXPathNextFollowing __attribute((alias("xmlXPathNextFollowing__internal_alias")));
 #define xmlXPathNextFollowing xmlXPathNextFollowing__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextFollowingSibling) xmlXPathNextFollowingSibling__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextFollowingSibling) xmlXPathNextFollowingSibling __attribute((alias("xmlXPathNextFollowingSibling__internal_alias")));
 #define xmlXPathNextFollowingSibling xmlXPathNextFollowingSibling__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextNamespace) xmlXPathNextNamespace__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextNamespace) xmlXPathNextNamespace __attribute((alias("xmlXPathNextNamespace__internal_alias")));
 #define xmlXPathNextNamespace xmlXPathNextNamespace__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextParent) xmlXPathNextParent__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextParent) xmlXPathNextParent __attribute((alias("xmlXPathNextParent__internal_alias")));
 #define xmlXPathNextParent xmlXPathNextParent__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextPreceding) xmlXPathNextPreceding__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextPreceding) xmlXPathNextPreceding __attribute((alias("xmlXPathNextPreceding__internal_alias")));
 #define xmlXPathNextPreceding xmlXPathNextPreceding__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextPrecedingSibling) xmlXPathNextPrecedingSibling__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextPrecedingSibling) xmlXPathNextPrecedingSibling __attribute((alias("xmlXPathNextPrecedingSibling__internal_alias")));
 #define xmlXPathNextPrecedingSibling xmlXPathNextPrecedingSibling__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNextSelf) xmlXPathNextSelf__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNextSelf) xmlXPathNextSelf __attribute((alias("xmlXPathNextSelf__internal_alias")));
 #define xmlXPathNextSelf xmlXPathNextSelf__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeLeading) xmlXPathNodeLeading__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeLeading) xmlXPathNodeLeading __attribute((alias("xmlXPathNodeLeading__internal_alias")));
 #define xmlXPathNodeLeading xmlXPathNodeLeading__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeLeadingSorted) xmlXPathNodeLeadingSorted__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeLeadingSorted) xmlXPathNodeLeadingSorted __attribute((alias("xmlXPathNodeLeadingSorted__internal_alias")));
 #define xmlXPathNodeLeadingSorted xmlXPathNodeLeadingSorted__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetAdd) xmlXPathNodeSetAdd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetAdd) xmlXPathNodeSetAdd __attribute((alias("xmlXPathNodeSetAdd__internal_alias")));
 #define xmlXPathNodeSetAdd xmlXPathNodeSetAdd__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetAddNs) xmlXPathNodeSetAddNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetAddNs) xmlXPathNodeSetAddNs __attribute((alias("xmlXPathNodeSetAddNs__internal_alias")));
 #define xmlXPathNodeSetAddNs xmlXPathNodeSetAddNs__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetAddUnique) xmlXPathNodeSetAddUnique__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetAddUnique) xmlXPathNodeSetAddUnique __attribute((alias("xmlXPathNodeSetAddUnique__internal_alias")));
 #define xmlXPathNodeSetAddUnique xmlXPathNodeSetAddUnique__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetContains) xmlXPathNodeSetContains__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetContains) xmlXPathNodeSetContains __attribute((alias("xmlXPathNodeSetContains__internal_alias")));
 #define xmlXPathNodeSetContains xmlXPathNodeSetContains__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetCreate) xmlXPathNodeSetCreate__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetCreate) xmlXPathNodeSetCreate __attribute((alias("xmlXPathNodeSetCreate__internal_alias")));
 #define xmlXPathNodeSetCreate xmlXPathNodeSetCreate__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetDel) xmlXPathNodeSetDel__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetDel) xmlXPathNodeSetDel __attribute((alias("xmlXPathNodeSetDel__internal_alias")));
 #define xmlXPathNodeSetDel xmlXPathNodeSetDel__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetFreeNs) xmlXPathNodeSetFreeNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetFreeNs) xmlXPathNodeSetFreeNs __attribute((alias("xmlXPathNodeSetFreeNs__internal_alias")));
 #define xmlXPathNodeSetFreeNs xmlXPathNodeSetFreeNs__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetMerge) xmlXPathNodeSetMerge__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetMerge) xmlXPathNodeSetMerge __attribute((alias("xmlXPathNodeSetMerge__internal_alias")));
 #define xmlXPathNodeSetMerge xmlXPathNodeSetMerge__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetRemove) xmlXPathNodeSetRemove__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetRemove) xmlXPathNodeSetRemove __attribute((alias("xmlXPathNodeSetRemove__internal_alias")));
 #define xmlXPathNodeSetRemove xmlXPathNodeSetRemove__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeSetSort) xmlXPathNodeSetSort__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeSetSort) xmlXPathNodeSetSort __attribute((alias("xmlXPathNodeSetSort__internal_alias")));
 #define xmlXPathNodeSetSort xmlXPathNodeSetSort__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeTrailing) xmlXPathNodeTrailing__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeTrailing) xmlXPathNodeTrailing __attribute((alias("xmlXPathNodeTrailing__internal_alias")));
 #define xmlXPathNodeTrailing xmlXPathNodeTrailing__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNodeTrailingSorted) xmlXPathNodeTrailingSorted__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNodeTrailingSorted) xmlXPathNodeTrailingSorted __attribute((alias("xmlXPathNodeTrailingSorted__internal_alias")));
 #define xmlXPathNodeTrailingSorted xmlXPathNodeTrailingSorted__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNormalizeFunction) xmlXPathNormalizeFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNormalizeFunction) xmlXPathNormalizeFunction __attribute((alias("xmlXPathNormalizeFunction__internal_alias")));
 #define xmlXPathNormalizeFunction xmlXPathNormalizeFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNotEqualValues) xmlXPathNotEqualValues__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNotEqualValues) xmlXPathNotEqualValues __attribute((alias("xmlXPathNotEqualValues__internal_alias")));
 #define xmlXPathNotEqualValues xmlXPathNotEqualValues__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNotFunction) xmlXPathNotFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNotFunction) xmlXPathNotFunction __attribute((alias("xmlXPathNotFunction__internal_alias")));
 #define xmlXPathNotFunction xmlXPathNotFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNsLookup) xmlXPathNsLookup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNsLookup) xmlXPathNsLookup __attribute((alias("xmlXPathNsLookup__internal_alias")));
 #define xmlXPathNsLookup xmlXPathNsLookup__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathNumberFunction) xmlXPathNumberFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathNumberFunction) xmlXPathNumberFunction __attribute((alias("xmlXPathNumberFunction__internal_alias")));
 #define xmlXPathNumberFunction xmlXPathNumberFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathObjectCopy) xmlXPathObjectCopy__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathObjectCopy) xmlXPathObjectCopy __attribute((alias("xmlXPathObjectCopy__internal_alias")));
 #define xmlXPathObjectCopy xmlXPathObjectCopy__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathOrderDocElems) xmlXPathOrderDocElems__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathOrderDocElems) xmlXPathOrderDocElems __attribute((alias("xmlXPathOrderDocElems__internal_alias")));
 #define xmlXPathOrderDocElems xmlXPathOrderDocElems__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathParseNCName) xmlXPathParseNCName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathParseNCName) xmlXPathParseNCName __attribute((alias("xmlXPathParseNCName__internal_alias")));
 #define xmlXPathParseNCName xmlXPathParseNCName__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathParseName) xmlXPathParseName__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathParseName) xmlXPathParseName __attribute((alias("xmlXPathParseName__internal_alias")));
 #define xmlXPathParseName xmlXPathParseName__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathPopBoolean) xmlXPathPopBoolean__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathPopBoolean) xmlXPathPopBoolean __attribute((alias("xmlXPathPopBoolean__internal_alias")));
 #define xmlXPathPopBoolean xmlXPathPopBoolean__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathPopExternal) xmlXPathPopExternal__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathPopExternal) xmlXPathPopExternal __attribute((alias("xmlXPathPopExternal__internal_alias")));
 #define xmlXPathPopExternal xmlXPathPopExternal__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathPopNodeSet) xmlXPathPopNodeSet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathPopNodeSet) xmlXPathPopNodeSet __attribute((alias("xmlXPathPopNodeSet__internal_alias")));
 #define xmlXPathPopNodeSet xmlXPathPopNodeSet__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathPopNumber) xmlXPathPopNumber__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathPopNumber) xmlXPathPopNumber __attribute((alias("xmlXPathPopNumber__internal_alias")));
 #define xmlXPathPopNumber xmlXPathPopNumber__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathPopString) xmlXPathPopString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathPopString) xmlXPathPopString __attribute((alias("xmlXPathPopString__internal_alias")));
 #define xmlXPathPopString xmlXPathPopString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathPositionFunction) xmlXPathPositionFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathPositionFunction) xmlXPathPositionFunction __attribute((alias("xmlXPathPositionFunction__internal_alias")));
 #define xmlXPathPositionFunction xmlXPathPositionFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisterAllFunctions) xmlXPathRegisterAllFunctions__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisterAllFunctions) xmlXPathRegisterAllFunctions __attribute((alias("xmlXPathRegisterAllFunctions__internal_alias")));
 #define xmlXPathRegisterAllFunctions xmlXPathRegisterAllFunctions__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisterFunc) xmlXPathRegisterFunc__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisterFunc) xmlXPathRegisterFunc __attribute((alias("xmlXPathRegisterFunc__internal_alias")));
 #define xmlXPathRegisterFunc xmlXPathRegisterFunc__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisterFuncLookup) xmlXPathRegisterFuncLookup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisterFuncLookup) xmlXPathRegisterFuncLookup __attribute((alias("xmlXPathRegisterFuncLookup__internal_alias")));
 #define xmlXPathRegisterFuncLookup xmlXPathRegisterFuncLookup__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisterFuncNS) xmlXPathRegisterFuncNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisterFuncNS) xmlXPathRegisterFuncNS __attribute((alias("xmlXPathRegisterFuncNS__internal_alias")));
 #define xmlXPathRegisterFuncNS xmlXPathRegisterFuncNS__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisterNs) xmlXPathRegisterNs__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisterNs) xmlXPathRegisterNs __attribute((alias("xmlXPathRegisterNs__internal_alias")));
 #define xmlXPathRegisterNs xmlXPathRegisterNs__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisterVariable) xmlXPathRegisterVariable__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisterVariable) xmlXPathRegisterVariable __attribute((alias("xmlXPathRegisterVariable__internal_alias")));
 #define xmlXPathRegisterVariable xmlXPathRegisterVariable__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisterVariableLookup) xmlXPathRegisterVariableLookup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisterVariableLookup) xmlXPathRegisterVariableLookup __attribute((alias("xmlXPathRegisterVariableLookup__internal_alias")));
 #define xmlXPathRegisterVariableLookup xmlXPathRegisterVariableLookup__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisterVariableNS) xmlXPathRegisterVariableNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisterVariableNS) xmlXPathRegisterVariableNS __attribute((alias("xmlXPathRegisterVariableNS__internal_alias")));
 #define xmlXPathRegisterVariableNS xmlXPathRegisterVariableNS__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisteredFuncsCleanup) xmlXPathRegisteredFuncsCleanup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisteredFuncsCleanup) xmlXPathRegisteredFuncsCleanup __attribute((alias("xmlXPathRegisteredFuncsCleanup__internal_alias")));
 #define xmlXPathRegisteredFuncsCleanup xmlXPathRegisteredFuncsCleanup__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisteredNsCleanup) xmlXPathRegisteredNsCleanup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisteredNsCleanup) xmlXPathRegisteredNsCleanup __attribute((alias("xmlXPathRegisteredNsCleanup__internal_alias")));
 #define xmlXPathRegisteredNsCleanup xmlXPathRegisteredNsCleanup__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRegisteredVariablesCleanup) xmlXPathRegisteredVariablesCleanup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRegisteredVariablesCleanup) xmlXPathRegisteredVariablesCleanup __attribute((alias("xmlXPathRegisteredVariablesCleanup__internal_alias")));
 #define xmlXPathRegisteredVariablesCleanup xmlXPathRegisteredVariablesCleanup__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRoot) xmlXPathRoot__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRoot) xmlXPathRoot __attribute((alias("xmlXPathRoot__internal_alias")));
 #define xmlXPathRoot xmlXPathRoot__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathRoundFunction) xmlXPathRoundFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathRoundFunction) xmlXPathRoundFunction __attribute((alias("xmlXPathRoundFunction__internal_alias")));
 #define xmlXPathRoundFunction xmlXPathRoundFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathStartsWithFunction) xmlXPathStartsWithFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathStartsWithFunction) xmlXPathStartsWithFunction __attribute((alias("xmlXPathStartsWithFunction__internal_alias")));
 #define xmlXPathStartsWithFunction xmlXPathStartsWithFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathStringEvalNumber) xmlXPathStringEvalNumber__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathStringEvalNumber) xmlXPathStringEvalNumber __attribute((alias("xmlXPathStringEvalNumber__internal_alias")));
 #define xmlXPathStringEvalNumber xmlXPathStringEvalNumber__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathStringFunction) xmlXPathStringFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathStringFunction) xmlXPathStringFunction __attribute((alias("xmlXPathStringFunction__internal_alias")));
 #define xmlXPathStringFunction xmlXPathStringFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathStringLengthFunction) xmlXPathStringLengthFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathStringLengthFunction) xmlXPathStringLengthFunction __attribute((alias("xmlXPathStringLengthFunction__internal_alias")));
 #define xmlXPathStringLengthFunction xmlXPathStringLengthFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathSubValues) xmlXPathSubValues__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathSubValues) xmlXPathSubValues __attribute((alias("xmlXPathSubValues__internal_alias")));
 #define xmlXPathSubValues xmlXPathSubValues__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathSubstringAfterFunction) xmlXPathSubstringAfterFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathSubstringAfterFunction) xmlXPathSubstringAfterFunction __attribute((alias("xmlXPathSubstringAfterFunction__internal_alias")));
 #define xmlXPathSubstringAfterFunction xmlXPathSubstringAfterFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathSubstringBeforeFunction) xmlXPathSubstringBeforeFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathSubstringBeforeFunction) xmlXPathSubstringBeforeFunction __attribute((alias("xmlXPathSubstringBeforeFunction__internal_alias")));
 #define xmlXPathSubstringBeforeFunction xmlXPathSubstringBeforeFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathSubstringFunction) xmlXPathSubstringFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathSubstringFunction) xmlXPathSubstringFunction __attribute((alias("xmlXPathSubstringFunction__internal_alias")));
 #define xmlXPathSubstringFunction xmlXPathSubstringFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathSumFunction) xmlXPathSumFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathSumFunction) xmlXPathSumFunction __attribute((alias("xmlXPathSumFunction__internal_alias")));
 #define xmlXPathSumFunction xmlXPathSumFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathTrailing) xmlXPathTrailing__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathTrailing) xmlXPathTrailing __attribute((alias("xmlXPathTrailing__internal_alias")));
 #define xmlXPathTrailing xmlXPathTrailing__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathTrailingSorted) xmlXPathTrailingSorted__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathTrailingSorted) xmlXPathTrailingSorted __attribute((alias("xmlXPathTrailingSorted__internal_alias")));
 #define xmlXPathTrailingSorted xmlXPathTrailingSorted__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathTranslateFunction) xmlXPathTranslateFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathTranslateFunction) xmlXPathTranslateFunction __attribute((alias("xmlXPathTranslateFunction__internal_alias")));
 #define xmlXPathTranslateFunction xmlXPathTranslateFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathTrueFunction) xmlXPathTrueFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathTrueFunction) xmlXPathTrueFunction __attribute((alias("xmlXPathTrueFunction__internal_alias")));
 #define xmlXPathTrueFunction xmlXPathTrueFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathValueFlipSign) xmlXPathValueFlipSign__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathValueFlipSign) xmlXPathValueFlipSign __attribute((alias("xmlXPathValueFlipSign__internal_alias")));
 #define xmlXPathValueFlipSign xmlXPathValueFlipSign__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathVariableLookup) xmlXPathVariableLookup__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathVariableLookup) xmlXPathVariableLookup __attribute((alias("xmlXPathVariableLookup__internal_alias")));
 #define xmlXPathVariableLookup xmlXPathVariableLookup__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathVariableLookupNS) xmlXPathVariableLookupNS__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathVariableLookupNS) xmlXPathVariableLookupNS __attribute((alias("xmlXPathVariableLookupNS__internal_alias")));
 #define xmlXPathVariableLookupNS xmlXPathVariableLookupNS__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathWrapCString) xmlXPathWrapCString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathWrapCString) xmlXPathWrapCString __attribute((alias("xmlXPathWrapCString__internal_alias")));
 #define xmlXPathWrapCString xmlXPathWrapCString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathWrapExternal) xmlXPathWrapExternal__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathWrapExternal) xmlXPathWrapExternal __attribute((alias("xmlXPathWrapExternal__internal_alias")));
 #define xmlXPathWrapExternal xmlXPathWrapExternal__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathWrapNodeSet) xmlXPathWrapNodeSet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathWrapNodeSet) xmlXPathWrapNodeSet __attribute((alias("xmlXPathWrapNodeSet__internal_alias")));
 #define xmlXPathWrapNodeSet xmlXPathWrapNodeSet__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPathWrapString) xmlXPathWrapString__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPathWrapString) xmlXPathWrapString __attribute((alias("xmlXPathWrapString__internal_alias")));
 #define xmlXPathWrapString xmlXPathWrapString__internal_alias
 #endif
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
 extern __typeof (xmlXPatherror) xmlXPatherror__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPatherror) xmlXPatherror __attribute((alias("xmlXPatherror__internal_alias")));
 #define xmlXPatherror xmlXPatherror__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrBuildNodeList) xmlXPtrBuildNodeList__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrBuildNodeList) xmlXPtrBuildNodeList __attribute((alias("xmlXPtrBuildNodeList__internal_alias")));
 #define xmlXPtrBuildNodeList xmlXPtrBuildNodeList__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrEval) xmlXPtrEval__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrEval) xmlXPtrEval __attribute((alias("xmlXPtrEval__internal_alias")));
 #define xmlXPtrEval xmlXPtrEval__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrEvalRangePredicate) xmlXPtrEvalRangePredicate__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrEvalRangePredicate) xmlXPtrEvalRangePredicate __attribute((alias("xmlXPtrEvalRangePredicate__internal_alias")));
 #define xmlXPtrEvalRangePredicate xmlXPtrEvalRangePredicate__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrFreeLocationSet) xmlXPtrFreeLocationSet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrFreeLocationSet) xmlXPtrFreeLocationSet __attribute((alias("xmlXPtrFreeLocationSet__internal_alias")));
 #define xmlXPtrFreeLocationSet xmlXPtrFreeLocationSet__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrLocationSetAdd) xmlXPtrLocationSetAdd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrLocationSetAdd) xmlXPtrLocationSetAdd __attribute((alias("xmlXPtrLocationSetAdd__internal_alias")));
 #define xmlXPtrLocationSetAdd xmlXPtrLocationSetAdd__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrLocationSetCreate) xmlXPtrLocationSetCreate__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrLocationSetCreate) xmlXPtrLocationSetCreate __attribute((alias("xmlXPtrLocationSetCreate__internal_alias")));
 #define xmlXPtrLocationSetCreate xmlXPtrLocationSetCreate__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrLocationSetDel) xmlXPtrLocationSetDel__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrLocationSetDel) xmlXPtrLocationSetDel __attribute((alias("xmlXPtrLocationSetDel__internal_alias")));
 #define xmlXPtrLocationSetDel xmlXPtrLocationSetDel__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrLocationSetMerge) xmlXPtrLocationSetMerge__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrLocationSetMerge) xmlXPtrLocationSetMerge __attribute((alias("xmlXPtrLocationSetMerge__internal_alias")));
 #define xmlXPtrLocationSetMerge xmlXPtrLocationSetMerge__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrLocationSetRemove) xmlXPtrLocationSetRemove__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrLocationSetRemove) xmlXPtrLocationSetRemove __attribute((alias("xmlXPtrLocationSetRemove__internal_alias")));
 #define xmlXPtrLocationSetRemove xmlXPtrLocationSetRemove__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewCollapsedRange) xmlXPtrNewCollapsedRange__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewCollapsedRange) xmlXPtrNewCollapsedRange __attribute((alias("xmlXPtrNewCollapsedRange__internal_alias")));
 #define xmlXPtrNewCollapsedRange xmlXPtrNewCollapsedRange__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewContext) xmlXPtrNewContext__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewContext) xmlXPtrNewContext __attribute((alias("xmlXPtrNewContext__internal_alias")));
 #define xmlXPtrNewContext xmlXPtrNewContext__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewLocationSetNodeSet) xmlXPtrNewLocationSetNodeSet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewLocationSetNodeSet) xmlXPtrNewLocationSetNodeSet __attribute((alias("xmlXPtrNewLocationSetNodeSet__internal_alias")));
 #define xmlXPtrNewLocationSetNodeSet xmlXPtrNewLocationSetNodeSet__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewLocationSetNodes) xmlXPtrNewLocationSetNodes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewLocationSetNodes) xmlXPtrNewLocationSetNodes __attribute((alias("xmlXPtrNewLocationSetNodes__internal_alias")));
 #define xmlXPtrNewLocationSetNodes xmlXPtrNewLocationSetNodes__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewRange) xmlXPtrNewRange__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewRange) xmlXPtrNewRange __attribute((alias("xmlXPtrNewRange__internal_alias")));
 #define xmlXPtrNewRange xmlXPtrNewRange__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewRangeNodeObject) xmlXPtrNewRangeNodeObject__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewRangeNodeObject) xmlXPtrNewRangeNodeObject __attribute((alias("xmlXPtrNewRangeNodeObject__internal_alias")));
 #define xmlXPtrNewRangeNodeObject xmlXPtrNewRangeNodeObject__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewRangeNodePoint) xmlXPtrNewRangeNodePoint__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewRangeNodePoint) xmlXPtrNewRangeNodePoint __attribute((alias("xmlXPtrNewRangeNodePoint__internal_alias")));
 #define xmlXPtrNewRangeNodePoint xmlXPtrNewRangeNodePoint__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewRangeNodes) xmlXPtrNewRangeNodes__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewRangeNodes) xmlXPtrNewRangeNodes __attribute((alias("xmlXPtrNewRangeNodes__internal_alias")));
 #define xmlXPtrNewRangeNodes xmlXPtrNewRangeNodes__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewRangePointNode) xmlXPtrNewRangePointNode__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewRangePointNode) xmlXPtrNewRangePointNode __attribute((alias("xmlXPtrNewRangePointNode__internal_alias")));
 #define xmlXPtrNewRangePointNode xmlXPtrNewRangePointNode__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrNewRangePoints) xmlXPtrNewRangePoints__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrNewRangePoints) xmlXPtrNewRangePoints __attribute((alias("xmlXPtrNewRangePoints__internal_alias")));
 #define xmlXPtrNewRangePoints xmlXPtrNewRangePoints__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrRangeToFunction) xmlXPtrRangeToFunction__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrRangeToFunction) xmlXPtrRangeToFunction __attribute((alias("xmlXPtrRangeToFunction__internal_alias")));
 #define xmlXPtrRangeToFunction xmlXPtrRangeToFunction__internal_alias
 #endif
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
 extern __typeof (xmlXPtrWrapLocationSet) xmlXPtrWrapLocationSet__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlXPtrWrapLocationSet) xmlXPtrWrapLocationSet __attribute((alias("xmlXPtrWrapLocationSet__internal_alias")));
 #define xmlXPtrWrapLocationSet xmlXPtrWrapLocationSet__internal_alias
diff --git a/gentest.py b/gentest.py
index 38630afe..c48c7b93 100755
--- a/gentest.py
+++ b/gentest.py
@@ -717,7 +717,7 @@ test_%s(void) {
     try:
 	conds = node.xpathEval("cond")
 	for cond in conds:
-	    test.write("#ifdef %s\n" % (cond.get_content()))
+	    test.write("#if %s\n" % (cond.get_content()))
 	    nb_cond = nb_cond + 1
     except:
         pass
diff --git a/globals.c b/globals.c
index e64461fc..01e2c426 100644
--- a/globals.c
+++ b/globals.c
@@ -513,7 +513,7 @@ xmlInitializeGlobalState(xmlGlobalStatePtr gs)
     gs->oldXMLWDcompatibility = 0;
     gs->xmlBufferAllocScheme = xmlBufferAllocSchemeThrDef;
     gs->xmlDefaultBufferSize = xmlDefaultBufferSizeThrDef;
-#ifdef LIBXML_SAX1_ENABLED
+#if defined(LIBXML_SAX1_ENABLED) && defined(LIBXML_LEGACY_ENABLED)
     initxmlDefaultSAXHandler(&gs->xmlDefaultSAXHandler, 1);
 #endif /* LIBXML_SAX1_ENABLED */
     gs->xmlDefaultSAXLocator.getPublicId = xmlSAX2GetPublicId;
diff --git a/include/libxml/SAX.h b/include/libxml/SAX.h
index 91b3fbc0..0ca161b6 100644
--- a/include/libxml/SAX.h
+++ b/include/libxml/SAX.h
@@ -18,7 +18,7 @@
 #include 
 #include 
 
-#ifdef LIBXML_SAX1_ENABLED
+#ifdef LIBXML_LEGACY_ENABLED
 
 #ifdef __cplusplus
 extern "C" {
@@ -150,6 +150,7 @@ XMLPUBFUN void XMLCALL
 						 const xmlChar *value,
 						 int len);
 
+#ifdef LIBXML_SAX1_ENABLED
 XMLPUBFUN void XMLCALL		
 		initxmlDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr,
 						 int warning);
@@ -161,10 +162,12 @@ XMLPUBFUN void XMLCALL
 XMLPUBFUN void XMLCALL		
 		initdocbDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr);
 #endif
+#endif /* LIBXML_SAX1_ENABLED */
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* LIBXML_SAX1_ENABLED */
+#endif /* LIBXML_LEGACY_ENABLED */
 
 #endif /* __XML_SAX_H__ */
diff --git a/include/libxml/SAX2.h b/include/libxml/SAX2.h
index 0ca019b9..66265645 100644
--- a/include/libxml/SAX2.h
+++ b/include/libxml/SAX2.h
@@ -98,6 +98,7 @@ XMLPUBFUN void XMLCALL
 		xmlSAX2StartDocument		(void *ctx);
 XMLPUBFUN void XMLCALL		
 		xmlSAX2EndDocument		(void *ctx);
+#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)
 XMLPUBFUN void XMLCALL		
 		xmlSAX2StartElement		(void *ctx,
 						 const xmlChar *fullname,
@@ -105,6 +106,7 @@ XMLPUBFUN void XMLCALL
 XMLPUBFUN void XMLCALL		
 		xmlSAX2EndElement		(void *ctx,
 						 const xmlChar *name);
+#endif /* LIBXML_SAX1_ENABLED or LIBXML_HTML_ENABLED */
 XMLPUBFUN void XMLCALL
 		xmlSAX2StartElementNs		(void *ctx,
 						 const xmlChar *localname,
@@ -143,8 +145,10 @@ XMLPUBFUN void XMLCALL
 						 const xmlChar *value,
 						 int len);
 
+#ifdef LIBXML_SAX1_ENABLED
 XMLPUBFUN int XMLCALL
 		xmlSAXDefaultVersion		(int version);
+#endif /* LIBXML_SAX1_ENABLED */
 
 XMLPUBFUN int XMLCALL
 		xmlSAXVersion			(xmlSAXHandler *hdlr,
@@ -155,17 +159,17 @@ XMLPUBFUN void XMLCALL
 #ifdef LIBXML_HTML_ENABLED
 XMLPUBFUN void XMLCALL		
 		xmlSAX2InitHtmlDefaultSAXHandler(xmlSAXHandler *hdlr);
+XMLPUBFUN void XMLCALL		
+		htmlDefaultSAXHandlerInit	(void);
 #endif
 #ifdef LIBXML_DOCB_ENABLED
 XMLPUBFUN void XMLCALL		
 		xmlSAX2InitDocbDefaultSAXHandler(xmlSAXHandler *hdlr);
+XMLPUBFUN void XMLCALL		
+		docbDefaultSAXHandlerInit	(void);
 #endif
 XMLPUBFUN void XMLCALL		
 		xmlDefaultSAXHandlerInit	(void);
-XMLPUBFUN void XMLCALL		
-		htmlDefaultSAXHandlerInit	(void);
-XMLPUBFUN void XMLCALL		
-		docbDefaultSAXHandlerInit	(void);
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/libxml/debugXML.h b/include/libxml/debugXML.h
index 733ccd43..5a9d20bc 100644
--- a/include/libxml/debugXML.h
+++ b/include/libxml/debugXML.h
@@ -139,8 +139,6 @@ typedef int (* xmlShellCmd) (xmlShellCtxtPtr ctxt,
 XMLPUBFUN void XMLCALL	
 	xmlShellPrintXPathError	(int errorType,
 				 const char *arg);
-XMLPUBFUN void XMLCALL	
-	xmlShellPrintNode	(xmlNodePtr node);
 XMLPUBFUN void XMLCALL	
 	xmlShellPrintXPathResult(xmlXPathObjectPtr list);
 XMLPUBFUN int XMLCALL	
@@ -158,17 +156,19 @@ XMLPUBFUN int XMLCALL
 				 char *arg,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
-XMLPUBFUN int XMLCALL	
-	xmlShellCat		(xmlShellCtxtPtr ctxt,
-				 char *arg,
-				 xmlNodePtr node,
-				 xmlNodePtr node2);
 XMLPUBFUN int XMLCALL	
 	xmlShellLoad		(xmlShellCtxtPtr ctxt,
 				 char *filename,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 #ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL	
+	xmlShellPrintNode	(xmlNodePtr node);
+XMLPUBFUN int XMLCALL	
+	xmlShellCat		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
 XMLPUBFUN int XMLCALL	
 	xmlShellWrite		(xmlShellCtxtPtr ctxt,
 				 char *filename,
@@ -180,11 +180,13 @@ XMLPUBFUN int XMLCALL
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 #endif /* LIBXML_OUTPUT_ENABLED */
+#ifdef LIBXML_VALID_ENABLED
 XMLPUBFUN int XMLCALL	
 	xmlShellValidate	(xmlShellCtxtPtr ctxt,
 				 char *dtd,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
+#endif /* LIBXML_VALID_ENABLED */
 XMLPUBFUN int XMLCALL	
 	xmlShellDu		(xmlShellCtxtPtr ctxt,
 				 char *arg,
diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h
index 76c5bbcc..c74b25f3 100644
--- a/include/libxml/encoding.h
+++ b/include/libxml/encoding.h
@@ -207,11 +207,13 @@ XMLPUBFUN int XMLCALL
 /*
  * Export a few useful functions
  */
+#ifdef LIBXML_OUTPUT_ENABLED
 XMLPUBFUN int XMLCALL	
 	UTF8Toisolat1			(unsigned char *out,
 					 int *outlen,
 					 const unsigned char *in,
 					 int *inlen);
+#endif /* LIBXML_OUTPUT_ENABLED */
 XMLPUBFUN int XMLCALL	
 	isolat1ToUTF8			(unsigned char *out,
 					 int *outlen,
diff --git a/include/libxml/entities.h b/include/libxml/entities.h
index 2dc12173..0bb28a0b 100644
--- a/include/libxml/entities.h
+++ b/include/libxml/entities.h
@@ -70,8 +70,10 @@ typedef xmlEntitiesTable *xmlEntitiesTablePtr;
  * External functions:
  */
 
+#ifdef LIBXML_LEGACY_ENABLED
 XMLPUBFUN void XMLCALL		
 		xmlInitializePredefinedEntities	(void);
+#endif /* LIBXML_LEGACY_ENABLED */
 XMLPUBFUN xmlEntityPtr XMLCALL
 			xmlAddDocEntity		(xmlDocPtr doc,
 						 const xmlChar *name,
@@ -97,9 +99,11 @@ XMLPUBFUN xmlEntityPtr XMLCALL
 XMLPUBFUN xmlEntityPtr XMLCALL		
 			xmlGetParameterEntity	(xmlDocPtr doc,
 						 const xmlChar *name);
+#ifdef LIBXML_LEGACY_ENABLED
 XMLPUBFUN const xmlChar * XMLCALL		
 			xmlEncodeEntities	(xmlDocPtr doc,
 						 const xmlChar *input);
+#endif /* LIBXML_LEGACY_ENABLED */
 XMLPUBFUN xmlChar * XMLCALL		
 			xmlEncodeEntitiesReentrant(xmlDocPtr doc,
 						 const xmlChar *input);
@@ -108,8 +112,10 @@ XMLPUBFUN xmlChar * XMLCALL
 						 const xmlChar *input);
 XMLPUBFUN xmlEntitiesTablePtr XMLCALL	
 			xmlCreateEntitiesTable	(void);
+#ifdef LIBXML_TREE_ENABLED
 XMLPUBFUN xmlEntitiesTablePtr XMLCALL	
 			xmlCopyEntitiesTable	(xmlEntitiesTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
 XMLPUBFUN void XMLCALL			
 			xmlFreeEntitiesTable	(xmlEntitiesTablePtr table);
 #ifdef LIBXML_OUTPUT_ENABLED
@@ -120,8 +126,10 @@ XMLPUBFUN void XMLCALL
 			xmlDumpEntityDecl	(xmlBufferPtr buf,
 						 xmlEntityPtr ent);
 #endif /* LIBXML_OUTPUT_ENABLED */
+#ifdef LIBXML_LEGACY_ENABLED
 XMLPUBFUN void XMLCALL			
 			xmlCleanupPredefinedEntities(void);
+#endif /* LIBXML_LEGACY_ENABLED */
 
 
 #ifdef __cplusplus
diff --git a/include/libxml/hash.h b/include/libxml/hash.h
index f6d2f653..b2f7b416 100644
--- a/include/libxml/hash.h
+++ b/include/libxml/hash.h
@@ -1,7 +1,7 @@
 /*
- * Summary: chained hash tables
- * description: this module implement the hash table support used in 
- * various place in the library.
+ * Summary: Chained hash tables
+ * Description: This module implements the hash table support used in 
+ * 		various places in the library.
  *
  * Copy: See Copyright for the status of this software.
  *
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index cc6fae1a..6e2d2419 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -823,24 +823,29 @@ XMLPUBFUN int XMLCALL
 /*
  * Basic parsing Interfaces
  */
+#ifdef LIBXML_SAX1_ENABLED
 XMLPUBFUN xmlDocPtr XMLCALL	
 		xmlParseDoc		(xmlChar *cur);
+XMLPUBFUN xmlDocPtr XMLCALL	
+		xmlParseFile		(const char *filename);
 XMLPUBFUN xmlDocPtr XMLCALL	
 		xmlParseMemory		(const char *buffer,
 					 int size);
-XMLPUBFUN xmlDocPtr XMLCALL	
-		xmlParseFile		(const char *filename);
+#endif /* LIBXML_SAX1_ENABLED */
 XMLPUBFUN int XMLCALL		
 		xmlSubstituteEntitiesDefault(int val);
 XMLPUBFUN int XMLCALL		
 		xmlKeepBlanksDefault	(int val);
+#ifdef LIBXML_PUSH_ENABLED
 XMLPUBFUN void XMLCALL		
 		xmlStopParser		(xmlParserCtxtPtr ctxt);
+#endif /* LIBXML_PUSH_ENABLED */
 XMLPUBFUN int XMLCALL		
 		xmlPedanticParserDefault(int val);
 XMLPUBFUN int XMLCALL		
 		xmlLineNumbersDefault	(int val);
 
+#ifdef LIBXML_SAX1_ENABLED
 /*
  * Recovery mode 
  */
@@ -851,6 +856,7 @@ XMLPUBFUN xmlDocPtr XMLCALL
 					 int size);
 XMLPUBFUN xmlDocPtr XMLCALL	
 		xmlRecoverFile		(const char *filename);
+#endif /* LIBXML_SAX1_ENABLED */
 
 /*
  * Less common routines and SAX interfaces
@@ -859,10 +865,7 @@ XMLPUBFUN int XMLCALL
 		xmlParseDocument	(xmlParserCtxtPtr ctxt);
 XMLPUBFUN int XMLCALL		
 		xmlParseExtParsedEnt	(xmlParserCtxtPtr ctxt);
-XMLPUBFUN xmlDocPtr XMLCALL	
-		xmlSAXParseDoc		(xmlSAXHandlerPtr sax,
-					 xmlChar *cur,
-					 int recovery);
+#ifdef LIBXML_SAX1_ENABLED
 XMLPUBFUN int XMLCALL		
 		xmlSAXUserParseFile	(xmlSAXHandlerPtr sax,
 					 void *user_data,
@@ -872,6 +875,10 @@ XMLPUBFUN int XMLCALL
 					 void *user_data,
 					 const char *buffer,
 					 int size);
+XMLPUBFUN xmlDocPtr XMLCALL	
+		xmlSAXParseDoc		(xmlSAXHandlerPtr sax,
+					 xmlChar *cur,
+					 int recovery);
 XMLPUBFUN xmlDocPtr XMLCALL	
 		xmlSAXParseMemory	(xmlSAXHandlerPtr sax,
 					 const char *buffer,
@@ -897,17 +904,22 @@ XMLPUBFUN xmlDocPtr XMLCALL
 					 const char *filename);
 XMLPUBFUN xmlDocPtr XMLCALL	
 		xmlParseEntity		(const char *filename);
-XMLPUBFUN xmlDtdPtr XMLCALL	
-		xmlParseDTD		(const xmlChar *ExternalID,
-					 const xmlChar *SystemID);
+#endif /* LIBXML_SAX1_ENABLED */
+
+#ifdef LIBXML_VALID_ENABLED
 XMLPUBFUN xmlDtdPtr XMLCALL	
 		xmlSAXParseDTD		(xmlSAXHandlerPtr sax,
 					 const xmlChar *ExternalID,
 					 const xmlChar *SystemID);
+XMLPUBFUN xmlDtdPtr XMLCALL	
+		xmlParseDTD		(const xmlChar *ExternalID,
+					 const xmlChar *SystemID);
 XMLPUBFUN xmlDtdPtr XMLCALL	
 		xmlIOParseDTD		(xmlSAXHandlerPtr sax,
 					 xmlParserInputBufferPtr input,
 					 xmlCharEncoding enc);
+#endif /* LIBXML_VALID_ENABLE */
+#ifdef LIBXML_SAX1_ENABLED
 XMLPUBFUN int XMLCALL	
 		xmlParseBalancedChunkMemory(xmlDocPtr doc,
 					 xmlSAXHandlerPtr sax,
@@ -915,12 +927,14 @@ XMLPUBFUN int XMLCALL
 					 int depth,
 					 const xmlChar *string,
 					 xmlNodePtr *lst);
+#endif /* LIBXML_SAX1_ENABLED */
 XMLPUBFUN xmlParserErrors XMLCALL
 		xmlParseInNodeContext	(xmlNodePtr node,
 					 const char *data,
 					 int datalen,
 					 int options,
 					 xmlNodePtr *lst);
+#ifdef LIBXML_SAX1_ENABLED
 XMLPUBFUN int XMLCALL          
 		xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc,
                      xmlSAXHandlerPtr sax,
@@ -937,6 +951,7 @@ XMLPUBFUN int XMLCALL
 					 const xmlChar *URL,
 					 const xmlChar *ID,
 					 xmlNodePtr *lst);
+#endif /* LIBXML_SAX1_ENABLED */
 XMLPUBFUN int XMLCALL		
 		xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx,
 					 const xmlChar *URL,
@@ -954,17 +969,19 @@ XMLPUBFUN void XMLCALL
 		xmlClearParserCtxt	(xmlParserCtxtPtr ctxt);
 XMLPUBFUN void XMLCALL		
 		xmlFreeParserCtxt	(xmlParserCtxtPtr ctxt);
+#ifdef LIBXML_SAX1_ENABLED
 XMLPUBFUN void XMLCALL		
 		xmlSetupParserForBuffer	(xmlParserCtxtPtr ctxt,
 					 const xmlChar* buffer,
 					 const char *filename);
+#endif /* LIBXML_SAX1_ENABLED */
 XMLPUBFUN xmlParserCtxtPtr XMLCALL 
 		xmlCreateDocParserCtxt	(const xmlChar *cur);
 
+#ifdef LIBXML_LEGACY_ENABLED
 /*
  * Reading/setting optional parsing features.
  */
-
 XMLPUBFUN int XMLCALL		
 		xmlGetFeaturesList	(int *len,
 					 const char **result);
@@ -976,6 +993,7 @@ XMLPUBFUN int XMLCALL
 		xmlSetFeature		(xmlParserCtxtPtr ctxt,
 					 const char *name,
 					 void *value);
+#endif /* LIBXML_LEGACY_ENABLED */
 
 #ifdef LIBXML_PUSH_ENABLED
 /*
diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h
index 14d4e4da..7ac0ce6e 100644
--- a/include/libxml/parserInternals.h
+++ b/include/libxml/parserInternals.h
@@ -199,7 +199,7 @@ XMLPUBVAR unsigned int xmlParserMaxDepth;
 #define IS_LETTER_CH(c) xmlIsBaseChar_ch(c)
 
 /**
- * IS_ASCII_LETTER(c)
+ * IS_ASCII_LETTER:
  * @c: an xmlChar value
  *
  * Macro to check [a-zA-Z]
@@ -209,7 +209,7 @@ XMLPUBVAR unsigned int xmlParserMaxDepth;
 				 ((0x61 <= (c)) && ((c) <= 0x7a)))
 
 /**
- * IS_ASCII_DIGIT(c)
+ * IS_ASCII_DIGIT:
  * @c: an xmlChar value
  *
  * Macro to check [0-9]
@@ -311,12 +311,6 @@ XMLPUBFUN void XMLCALL
 						 const xmlChar * str1,
 						 const xmlChar * str2);
 #endif
-/**
- * Entities
- */
-XMLPUBFUN void XMLCALL			
-			xmlHandleEntity		(xmlParserCtxtPtr ctxt,
-						 xmlEntityPtr entity);
 
 /**
  * Input Streams.
@@ -347,23 +341,10 @@ XMLPUBFUN xmlChar * XMLCALL
 			xmlSplitQName		(xmlParserCtxtPtr ctxt,
 						 const xmlChar *name,
 						 xmlChar **prefix);
-XMLPUBFUN xmlChar * XMLCALL		
-			xmlNamespaceParseNCName	(xmlParserCtxtPtr ctxt);
-XMLPUBFUN xmlChar * XMLCALL		
-			xmlNamespaceParseQName	(xmlParserCtxtPtr ctxt,
-						 xmlChar **prefix);
-XMLPUBFUN xmlChar * XMLCALL		
-			xmlNamespaceParseNSDef	(xmlParserCtxtPtr ctxt);
-XMLPUBFUN xmlChar * XMLCALL		
-			xmlParseQuotedString	(xmlParserCtxtPtr ctxt);
-XMLPUBFUN void XMLCALL			
-			xmlParseNamespace	(xmlParserCtxtPtr ctxt);
 
 /**
  * Generic production rules.
  */
-XMLPUBFUN xmlChar * XMLCALL		
-			xmlScanName		(xmlParserCtxtPtr ctxt);
 XMLPUBFUN const xmlChar * XMLCALL		
 			xmlParseName		(xmlParserCtxtPtr ctxt);
 XMLPUBFUN xmlChar * XMLCALL		
@@ -435,6 +416,7 @@ XMLPUBFUN void XMLCALL
 			xmlParsePEReference	(xmlParserCtxtPtr ctxt);
 XMLPUBFUN void XMLCALL			
 			xmlParseDocTypeDecl	(xmlParserCtxtPtr ctxt);
+#ifdef LIBXML_SAX1_ENABLED
 XMLPUBFUN const xmlChar * XMLCALL		
 			xmlParseAttribute	(xmlParserCtxtPtr ctxt,
 						 xmlChar **value);
@@ -442,6 +424,7 @@ XMLPUBFUN const xmlChar * XMLCALL
 			xmlParseStartTag	(xmlParserCtxtPtr ctxt);
 XMLPUBFUN void XMLCALL			
 			xmlParseEndTag		(xmlParserCtxtPtr ctxt);
+#endif /* LIBXML_SAX1_ENABLED */
 XMLPUBFUN void XMLCALL			
 			xmlParseCDSect		(xmlParserCtxtPtr ctxt);
 XMLPUBFUN void XMLCALL			
@@ -493,13 +476,6 @@ XMLPUBFUN void XMLCALL
  */
 #define XML_SUBSTITUTE_BOTH 	3
 
-XMLPUBFUN xmlChar * XMLCALL
-		xmlDecodeEntities		(xmlParserCtxtPtr ctxt,
-						 int len,
-						 int what,
-						 xmlChar end,
-						 xmlChar  end2,
-						 xmlChar end3);
 XMLPUBFUN xmlChar * XMLCALL
 		xmlStringDecodeEntities		(xmlParserCtxtPtr ctxt,
 						 const xmlChar *str,
@@ -537,7 +513,6 @@ XMLPUBFUN int XMLCALL			xmlStringCurrentChar	(xmlParserCtxtPtr ctxt,
 						 const xmlChar *cur,
 						 int *len);
 XMLPUBFUN void XMLCALL			xmlParserHandlePEReference(xmlParserCtxtPtr ctxt);
-XMLPUBFUN void XMLCALL			xmlParserHandleReference(xmlParserCtxtPtr ctxt);
 XMLPUBFUN int XMLCALL			xmlCheckLanguageID	(const xmlChar *lang);
 
 /*
@@ -566,6 +541,7 @@ XMLPUBFUN htmlParserCtxtPtr XMLCALL	htmlCreateFileParserCtxt(const char *filenam
  * Specific function to keep track of entities references
  * and used by the XSLT debugger.
  */
+#ifdef LIBXML_LEGACY_ENABLED
 /**
  * xmlEntityReferenceFunc:
  * @ent: the entity
@@ -581,6 +557,36 @@ typedef	void	(*xmlEntityReferenceFunc)	(xmlEntityPtr ent,
   
 XMLPUBFUN void XMLCALL		xmlSetEntityReferenceFunc	(xmlEntityReferenceFunc func);
 
+XMLPUBFUN xmlChar * XMLCALL		
+			xmlParseQuotedString	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+                        xmlParseNamespace       (xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL		
+			xmlNamespaceParseNSDef	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL		
+			xmlScanName		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL		
+			xmlNamespaceParseNCName	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL	xmlParserHandleReference(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL		
+			xmlNamespaceParseQName	(xmlParserCtxtPtr ctxt,
+						 xmlChar **prefix);
+/**
+ * Entities
+ */
+XMLPUBFUN xmlChar * XMLCALL
+		xmlDecodeEntities		(xmlParserCtxtPtr ctxt,
+						 int len,
+						 int what,
+						 xmlChar end,
+						 xmlChar  end2,
+						 xmlChar end3);
+XMLPUBFUN void XMLCALL			
+			xmlHandleEntity		(xmlParserCtxtPtr ctxt,
+						 xmlEntityPtr entity);
+
+#endif /* LIBXML_LEGACY_ENABLED */
+
 #ifdef IN_LIBXML
 /*
  * internal only
diff --git a/include/libxml/schemasInternals.h b/include/libxml/schemasInternals.h
index 9fb7abaa..aab55b81 100644
--- a/include/libxml/schemasInternals.h
+++ b/include/libxml/schemasInternals.h
@@ -204,7 +204,7 @@ struct _xmlSchemaAnnot {
  */
 #define XML_SCHEMAS_ATTR_USE_OPTIONAL 2
 /**
- * XML_SCHEMAS_ATTR_GLOABAL:
+ * XML_SCHEMAS_ATTR_GLOBAL:
  *
  * allow elements in no namespace
  */
@@ -455,19 +455,19 @@ struct _xmlSchemaFacetLink {
  */
 #define XML_SCHEMAS_TYPE_FINAL_UNION    1 << 12
 /**
- * XML_SCHEMAS_TYPE_FINAL_UNION:
+ * XML_SCHEMAS_TYPE_FINAL_DEFAULT:
  *
- * the simpleType has a final of "union".
+ * the simpleType has a final of "default".
  */
 #define XML_SCHEMAS_TYPE_FINAL_DEFAULT    1 << 13
 /**
- * XML_SCHEMAS_TYPE_FINAL_UNION:
+ * XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE:
  *
- * the simpleType has a final of "union".
+ * Marks the item as a builtin primitive.
  */
 #define XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE    1 << 14
 /**
- * XML_SCHEMAS_TYPE_MARKED
+ * XML_SCHEMAS_TYPE_MARKED:
  *
  * Marks the item as marked; used for circular checks.
  */
@@ -486,7 +486,7 @@ struct _xmlSchemaFacetLink {
  */
 #define XML_SCHEMAS_TYPE_BLOCK_EXTENSION    1 << 18
 /**
- * XML_SCHEMAS_TYPE_FINAL_RESTRICTION:
+ * XML_SCHEMAS_TYPE_BLOCK_RESTRICTION:
  *
  * the complexType has a 'block' of "restriction".
  */
@@ -593,14 +593,14 @@ struct _xmlSchemaType {
  */
 #define XML_SCHEMAS_ELEM_NSDEFAULT        1 << 7
 /**
- * XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
+ * XML_SCHEMAS_ELEM_INTERNAL_RESOLVED:
  *
  * this is set when "type", "ref", "substitutionGroup"
  * references have been resolved.
  */
 #define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED        1 << 8
  /**
- * XML_SCHEMAS_ELEM_CIRCULAR
+ * XML_SCHEMAS_ELEM_CIRCULAR:
  *
  * a helper flag for the search of circular references.
  */
@@ -636,13 +636,13 @@ struct _xmlSchemaType {
  */
 #define XML_SCHEMAS_ELEM_FINAL_ABSENT        1 << 14
 /**
- * XML_SCHEMAS_ELEM_BLOCK_EXTENSION:
+ * XML_SCHEMAS_ELEM_FINAL_EXTENSION:
  *
  * substitution group exclusions: "extension"
  */
 #define XML_SCHEMAS_ELEM_FINAL_EXTENSION        1 << 15
 /**
- * XML_SCHEMAS_ELEM_BLOCK_RESTRICTION:
+ * XML_SCHEMAS_ELEM_FINAL_RESTRICTION:
  *
  * substitution group exclusions: "restriction"
  */
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index e2a5d018..28d81e79 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -536,9 +536,13 @@ struct _xmlDoc {
 /*
  * Some helper functions
  */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
 XMLPUBFUN int XMLCALL
 		xmlValidateNCName	(const xmlChar *value,
 					 int space);
+#endif
+
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 XMLPUBFUN int XMLCALL		
 		xmlValidateQName	(const xmlChar *value,
 					 int space);
@@ -548,6 +552,7 @@ XMLPUBFUN int XMLCALL
 XMLPUBFUN int XMLCALL		
 		xmlValidateNMToken	(const xmlChar *value,
 					 int space);
+#endif
 
 XMLPUBFUN xmlChar * XMLCALL	
 		xmlBuildQName		(const xmlChar *ncname,
@@ -632,10 +637,12 @@ XMLPUBFUN xmlDtdPtr XMLCALL
 		xmlGetIntSubset		(xmlDocPtr doc);
 XMLPUBFUN void XMLCALL		
 		xmlFreeDtd		(xmlDtdPtr cur);
+#ifdef LIBXML_LEGACY_ENABLED
 XMLPUBFUN xmlNsPtr XMLCALL	
 		xmlNewGlobalNs		(xmlDocPtr doc,
 					 const xmlChar *href,
 					 const xmlChar *prefix);
+#endif /* LIBXML_LEGACY_ENABLED */
 XMLPUBFUN xmlNsPtr XMLCALL	
 		xmlNewNs		(xmlNodePtr node,
 					 const xmlChar *href,
@@ -652,10 +659,13 @@ XMLPUBFUN xmlAttrPtr XMLCALL
 		xmlNewDocProp		(xmlDocPtr doc,
 					 const xmlChar *name,
 					 const xmlChar *value);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED)
 XMLPUBFUN xmlAttrPtr XMLCALL	
 		xmlNewProp		(xmlNodePtr node,
 					 const xmlChar *name,
 					 const xmlChar *value);
+#endif
 XMLPUBFUN xmlAttrPtr XMLCALL	
 		xmlNewNsProp		(xmlNodePtr node,
 					 xmlNsPtr ns,
@@ -679,11 +689,12 @@ XMLPUBFUN xmlAttrPtr XMLCALL
 #ifdef LIBXML_TREE_ENABLED
 XMLPUBFUN xmlDtdPtr XMLCALL	
 		xmlCopyDtd		(xmlDtdPtr dtd);
+#endif /* LIBXML_TREE_ENABLED */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 XMLPUBFUN xmlDocPtr XMLCALL	
 		xmlCopyDoc		(xmlDocPtr doc,
 					 int recursive);
-#endif /* LIBXML_TREE_ENABLED */
-
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) */
 /*
  * Creating new nodes.
  */
@@ -697,27 +708,19 @@ XMLPUBFUN xmlNodePtr XMLCALL
 					 xmlNsPtr ns,
 					 xmlChar *name,
 					 const xmlChar *content);
-XMLPUBFUN xmlNodePtr XMLCALL	
-		xmlNewDocRawNode	(xmlDocPtr doc,
-					 xmlNsPtr ns,
-					 const xmlChar *name,
-					 const xmlChar *content);
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlNewNode		(xmlNsPtr ns,
 					 const xmlChar *name);
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlNewNodeEatName	(xmlNsPtr ns,
 					 xmlChar *name);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlNewChild		(xmlNodePtr parent,
 					 xmlNsPtr ns,
 					 const xmlChar *name,
 					 const xmlChar *content);
-XMLPUBFUN xmlNodePtr XMLCALL	
-		xmlNewTextChild		(xmlNodePtr parent,
-					 xmlNsPtr ns,
-					 const xmlChar *name,
-					 const xmlChar *content);
+#endif
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlNewDocText		(xmlDocPtr doc,
 					 const xmlChar *content);
@@ -765,6 +768,16 @@ XMLPUBFUN xmlNodePtr XMLCALL
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlCopyNodeList		(const xmlNodePtr node);
 #ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlNodePtr XMLCALL	
+		xmlNewTextChild		(xmlNodePtr parent,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL	
+		xmlNewDocRawNode	(xmlDocPtr doc,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlNewDocFragment	(xmlDocPtr doc);
 #endif /* LIBXML_TREE_ENABLED */
@@ -774,10 +787,10 @@ XMLPUBFUN xmlNodePtr XMLCALL
  */
 XMLPUBFUN long XMLCALL		
 		xmlGetLineNo		(xmlNodePtr node);
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
 XMLPUBFUN xmlChar * XMLCALL	
 		xmlGetNodePath		(xmlNodePtr node);
-#endif /* LIBXML_TREE_ENABLED */
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED) */
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlDocGetRootElement	(xmlDocPtr doc);
 XMLPUBFUN xmlNodePtr XMLCALL	
@@ -787,13 +800,15 @@ XMLPUBFUN int XMLCALL
 XMLPUBFUN int XMLCALL		
 		xmlIsBlankNode		(xmlNodePtr node);
 
-#ifdef LIBXML_TREE_ENABLED
 /*
  * Changing the structure.
  */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlDocSetRootElement	(xmlDocPtr doc,
 					 xmlNodePtr root);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED) */
+#ifdef LIBXML_TREE_ENABLED
 XMLPUBFUN void XMLCALL		
 		xmlNodeSetName		(xmlNodePtr cur,
 					 const xmlChar *name);
@@ -804,14 +819,17 @@ XMLPUBFUN xmlNodePtr XMLCALL
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlAddChildList		(xmlNodePtr parent,
 					 xmlNodePtr cur);
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlReplaceNode		(xmlNodePtr old,
 					 xmlNodePtr cur);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED) */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED)
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlAddPrevSibling	(xmlNodePtr cur,
 					 xmlNodePtr elem);
-#endif /* LIBXML_TREE_ENABLED */
+#endif /* LIBXML_TREE_ENABLED || LIBXML_HTML_ENABLED || LIBXML_SCHEMAS_ENABLED */
 XMLPUBFUN xmlNodePtr XMLCALL	
 		xmlAddSibling		(xmlNodePtr cur,
 					 xmlNodePtr elem);
@@ -848,11 +866,11 @@ XMLPUBFUN xmlNsPtr XMLCALL
 		xmlSearchNsByHref	(xmlDocPtr doc,
 					 xmlNodePtr node,
 					 const xmlChar *href);
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED)
 XMLPUBFUN xmlNsPtr * XMLCALL	
 		xmlGetNsList		(xmlDocPtr doc,
 					 xmlNodePtr node);
-#endif /* LIBXML_TREE_ENABLED */
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) */
 
 XMLPUBFUN void XMLCALL		
 		xmlSetNs		(xmlNodePtr node,
@@ -865,12 +883,17 @@ XMLPUBFUN xmlNsPtr XMLCALL
 /*
  * Changing the content.
  */
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED)
 XMLPUBFUN xmlAttrPtr XMLCALL	
 		xmlSetProp		(xmlNodePtr node,
 					 const xmlChar *name,
 					 const xmlChar *value);
-#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN xmlAttrPtr XMLCALL	
+		xmlSetNsProp		(xmlNodePtr node,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *value);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED) */
 XMLPUBFUN xmlChar * XMLCALL	
 		xmlGetNoNsProp		(xmlNodePtr node,
 					 const xmlChar *name);
@@ -884,13 +907,6 @@ XMLPUBFUN xmlAttrPtr XMLCALL
 		xmlHasNsProp		(xmlNodePtr node,
 					 const xmlChar *name,
 					 const xmlChar *nameSpace);
-#ifdef LIBXML_TREE_ENABLED
-XMLPUBFUN xmlAttrPtr XMLCALL	
-		xmlSetNsProp		(xmlNodePtr node,
-					 xmlNsPtr ns,
-					 const xmlChar *name,
-					 const xmlChar *value);
-#endif /* LIBXML_TREE_ENABLED */
 XMLPUBFUN xmlChar * XMLCALL	
 		xmlGetNsProp		(xmlNodePtr node,
 					 const xmlChar *name,
@@ -948,24 +964,28 @@ XMLPUBFUN void XMLCALL
 XMLPUBFUN xmlChar * XMLCALL	
 		xmlNodeGetBase		(xmlDocPtr doc,
 					 xmlNodePtr cur);
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED)
 XMLPUBFUN void XMLCALL		
 		xmlNodeSetBase		(xmlNodePtr cur,
 					 const xmlChar *uri);
+#endif
 
 /*
  * Removing content.
  */
+#ifdef LIBXML_TREE_ENABLED
 XMLPUBFUN int XMLCALL		
 		xmlRemoveProp		(xmlAttrPtr cur);
-XMLPUBFUN int XMLCALL		
-		xmlUnsetProp		(xmlNodePtr node,
-					 const xmlChar *name);
+#endif /* LIBXML_TREE_ENABLED */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 XMLPUBFUN int XMLCALL		
 		xmlUnsetNsProp		(xmlNodePtr node,
 					 xmlNsPtr ns,
 					 const xmlChar *name);
-#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN int XMLCALL		
+		xmlUnsetProp		(xmlNodePtr node,
+					 const xmlChar *name);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) */
 
 /*
  * Internal, don't use.
@@ -980,17 +1000,21 @@ XMLPUBFUN void XMLCALL
 		xmlBufferWriteQuotedString(xmlBufferPtr buf,
 					 const xmlChar *string);
 
+#ifdef LIBXML_OUTPUT_ENABLED
 XMLPUBFUN void xmlAttrSerializeTxtContent(xmlBufferPtr buf,
 					 xmlDocPtr doc,
 					 xmlAttrPtr attr,
 					 const xmlChar *string);
+#endif /* LIBXML_OUTPUT_ENABLED */
 
+#ifdef LIBXML_TREE_ENABLED
 /*
  * Namespace handling.
  */
 XMLPUBFUN int XMLCALL		
 		xmlReconciliateNs	(xmlDocPtr doc,
 					 xmlNodePtr tree);
+#endif
 
 #ifdef LIBXML_OUTPUT_ENABLED
 /*
diff --git a/include/libxml/valid.h b/include/libxml/valid.h
index 99777d17..858dee99 100644
--- a/include/libxml/valid.h
+++ b/include/libxml/valid.h
@@ -149,12 +149,6 @@ typedef xmlIDTable *xmlIDTablePtr;
 typedef struct _xmlHashTable xmlRefTable;
 typedef xmlRefTable *xmlRefTablePtr;
 
-/* Allocate/Release Validation Contexts */
-XMLPUBFUN xmlValidCtxtPtr XMLCALL	    
-		xmlNewValidCtxt(void);
-XMLPUBFUN void XMLCALL		    
-		xmlFreeValidCtxt(xmlValidCtxtPtr);
-
 /* Notation */
 XMLPUBFUN xmlNotationPtr XMLCALL	    
 		xmlAddNotationDecl	(xmlValidCtxtPtr ctxt,
@@ -162,8 +156,10 @@ XMLPUBFUN xmlNotationPtr XMLCALL
 					 const xmlChar *name,
 					 const xmlChar *PublicID,
 					 const xmlChar *SystemID);
+#ifdef LIBXML_TREE_ENABLED
 XMLPUBFUN xmlNotationTablePtr XMLCALL 
 		xmlCopyNotationTable	(xmlNotationTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
 XMLPUBFUN void XMLCALL		    
 		xmlFreeNotationTable	(xmlNotationTablePtr table);
 #ifdef LIBXML_OUTPUT_ENABLED
@@ -188,11 +184,13 @@ XMLPUBFUN void XMLCALL
 					 int size,
 	                                 xmlElementContentPtr content,
 					 int glob);
+#ifdef LIBXML_OUTPUT_ENABLED
 /* DEPRECATED */
 XMLPUBFUN void XMLCALL		     
 		xmlSprintfElementContent(char *buf,
 	                                 xmlElementContentPtr content,
 					 int glob);
+#endif /* LIBXML_OUTPUT_ENABLED */
 /* DEPRECATED */
 
 /* Element */
@@ -202,8 +200,10 @@ XMLPUBFUN xmlElementPtr XMLCALL
 					 const xmlChar *name,
 					 xmlElementTypeVal type,
 					 xmlElementContentPtr content);
+#ifdef LIBXML_TREE_ENABLED
 XMLPUBFUN xmlElementTablePtr XMLCALL 
 		xmlCopyElementTable	(xmlElementTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
 XMLPUBFUN void XMLCALL		   
 		xmlFreeElementTable	(xmlElementTablePtr table);
 #ifdef LIBXML_OUTPUT_ENABLED
@@ -220,8 +220,10 @@ XMLPUBFUN xmlEnumerationPtr XMLCALL
 		xmlCreateEnumeration	(const xmlChar *name);
 XMLPUBFUN void XMLCALL		   
 		xmlFreeEnumeration	(xmlEnumerationPtr cur);
+#ifdef LIBXML_TREE_ENABLED
 XMLPUBFUN xmlEnumerationPtr XMLCALL  
 		xmlCopyEnumeration	(xmlEnumerationPtr cur);
+#endif /* LIBXML_TREE_ENABLED */
 
 /* Attribute */
 XMLPUBFUN xmlAttributePtr XMLCALL	    
@@ -234,8 +236,10 @@ XMLPUBFUN xmlAttributePtr XMLCALL
 					 xmlAttributeDefault def,
 					 const xmlChar *defaultValue,
 					 xmlEnumerationPtr tree);
+#ifdef LIBXML_TREE_ENABLED
 XMLPUBFUN xmlAttributeTablePtr XMLCALL 
 		xmlCopyAttributeTable  (xmlAttributeTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
 XMLPUBFUN void XMLCALL		     
 		xmlFreeAttributeTable  (xmlAttributeTablePtr table);
 #ifdef LIBXML_OUTPUT_ENABLED
@@ -289,6 +293,12 @@ XMLPUBFUN xmlListPtr XMLCALL
  * The public function calls related to validity checking.
  */
 #ifdef LIBXML_VALID_ENABLED
+/* Allocate/Release Validation Contexts */
+XMLPUBFUN xmlValidCtxtPtr XMLCALL	    
+		xmlNewValidCtxt(void);
+XMLPUBFUN void XMLCALL		    
+		xmlFreeValidCtxt(xmlValidCtxtPtr);
+
 XMLPUBFUN int XMLCALL		
 		xmlValidateRoot		(xmlValidCtxtPtr ctxt,
 					 xmlDocPtr doc);
@@ -352,11 +362,14 @@ XMLPUBFUN int XMLCALL
 XMLPUBFUN int XMLCALL		
 		xmlValidateDocumentFinal(xmlValidCtxtPtr ctxt,
 					 xmlDocPtr doc);
+#endif /* LIBXML_VALID_ENABLED */
+
+#if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 XMLPUBFUN int XMLCALL		
 		xmlValidateNotationUse	(xmlValidCtxtPtr ctxt,
 					 xmlDocPtr doc,
 					 const xmlChar *notationName);
-#endif /* LIBXML_VALID_ENABLED */
+#endif /* LIBXML_VALID_ENABLED or LIBXML_SCHEMAS_ENABLED */
 
 XMLPUBFUN int XMLCALL		
 		xmlIsMixedElement	(xmlDocPtr doc,
@@ -381,19 +394,19 @@ XMLPUBFUN xmlElementPtr XMLCALL
 		xmlGetDtdElementDesc	(xmlDtdPtr dtd,
 					 const xmlChar *name);
 
-XMLPUBFUN int XMLCALL		
-		xmlValidGetValidElements(xmlNode *prev,
-					 xmlNode *next,
-					 const xmlChar **names,
-					 int max);
+#ifdef LIBXML_VALID_ENABLED
+
 XMLPUBFUN int XMLCALL		
 		xmlValidGetPotentialChildren(xmlElementContent *ctree,
 					 const xmlChar **list,
 					 int *len,
 					 int max);
 
-#ifdef LIBXML_VALID_ENABLED
-
+XMLPUBFUN int XMLCALL		
+		xmlValidGetValidElements(xmlNode *prev,
+					 xmlNode *next,
+					 const xmlChar **names,
+					 int max);
 XMLPUBFUN int XMLCALL		
 		xmlValidateNameValue	(const xmlChar *value);
 XMLPUBFUN int XMLCALL		
@@ -403,7 +416,6 @@ XMLPUBFUN int XMLCALL
 XMLPUBFUN int XMLCALL		
 		xmlValidateNmtokensValue(const xmlChar *value);
 
-#endif /* LIBXML_VALID_ENABLED */
 #ifdef LIBXML_REGEXP_ENABLED
 /*
  * Validation based on the regexp support
@@ -427,6 +439,7 @@ XMLPUBFUN int XMLCALL
 					 xmlNodePtr elem,
 					 const xmlChar *qname);
 #endif /* LIBXML_REGEXP_ENABLED */
+#endif /* LIBXML_VALID_ENABLED */
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/libxml/xlink.h b/include/libxml/xlink.h
index 4b99611a..083c7eda 100644
--- a/include/libxml/xlink.h
+++ b/include/libxml/xlink.h
@@ -13,9 +13,12 @@
 #include 
 #include 
 
+#ifdef LIBXML_XPTR_ENABLED
+
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 /**
  * Various defines for the various Link properties.
  *
@@ -180,4 +183,7 @@ XMLPUBFUN xlinkType XMLCALL
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* LIBXML_XPTR_ENABLED */
+
 #endif /* __XML_XLINK_H__ */
diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
index f50a3f94..0f7b8a8c 100644
--- a/include/libxml/xmlIO.h
+++ b/include/libxml/xmlIO.h
@@ -268,16 +268,15 @@ xmlOutputBufferPtr
 	__xmlOutputBufferCreateFilename(const char *URI,
                               xmlCharEncodingHandlerPtr encoder,
                               int compression);
-#endif /* LIBXML_OUTPUT_ENABLED */
 
-/*  This function only exists if HTTP support built into the library  */
 #ifdef LIBXML_HTTP_ENABLED
-XMLPUBFUN void * XMLCALL	
-	xmlIOHTTPOpenW			(const char * post_uri,
-					 int   compression );
+/*  This function only exists if HTTP support built into the library  */
 XMLPUBFUN void XMLCALL	
 	xmlRegisterHTTPPostCallbacks	(void );
-#endif
+#endif /* LIBXML_HTTP_ENABLED */
+	
+#endif /* LIBXML_OUTPUT_ENABLED */
+
 XMLPUBFUN xmlParserInputPtr XMLCALL
 	xmlCheckHTTPInput		(xmlParserCtxtPtr ctxt,
 					 xmlParserInputPtr ret);
@@ -321,6 +320,11 @@ XMLPUBFUN int XMLCALL
 	xmlIOHTTPMatch 			(const char *filename);
 XMLPUBFUN void * XMLCALL	
 	xmlIOHTTPOpen 			(const char *filename);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void * XMLCALL	
+	xmlIOHTTPOpenW			(const char * post_uri,
+					 int   compression );
+#endif /* LIBXML_OUTPUT_ENABLED */
 XMLPUBFUN int XMLCALL 	
 	xmlIOHTTPRead			(void * context, 
 					 char * buffer, 
diff --git a/include/libxml/xmlautomata.h b/include/libxml/xmlautomata.h
index b1b94855..d29ddcfc 100644
--- a/include/libxml/xmlautomata.h
+++ b/include/libxml/xmlautomata.h
@@ -13,6 +13,7 @@
 #include 
 #include 
 
+#ifdef LIBXML_REGEXP_ENABLED
 #ifdef LIBXML_AUTOMATA_ENABLED
 #include 
 
@@ -132,4 +133,6 @@ XMLPUBFUN int XMLCALL
 #endif 
 
 #endif /* LIBXML_AUTOMATA_ENABLED */
+#endif /* LIBXML_REGEXP_ENABLED */
+
 #endif /* __XML_AUTOMATA_H__ */
diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h
index 3d79006e..6d00594a 100644
--- a/include/libxml/xmlreader.h
+++ b/include/libxml/xmlreader.h
@@ -245,10 +245,12 @@ XMLPUBFUN xmlNodePtr XMLCALL
 		    xmlTextReaderCurrentNode	(xmlTextReaderPtr reader);
 XMLPUBFUN xmlNodePtr XMLCALL	
 		    xmlTextReaderPreserve	(xmlTextReaderPtr reader);
+#ifdef LIBXML_PATTERN_ENABLED
 XMLPUBFUN int XMLCALL	
 		    xmlTextReaderPreservePattern(xmlTextReaderPtr reader,
 		    				 const xmlChar *pattern,
 						 const xmlChar **namespaces);
+#endif /* LIBXML_PATTERN_ENABLED */
 XMLPUBFUN xmlDocPtr XMLCALL	
 		    xmlTextReaderCurrentDoc	(xmlTextReaderPtr reader);
 XMLPUBFUN xmlNodePtr XMLCALL	
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index 19a2354a..eee26305 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -26,11 +26,15 @@
 #include 
 #include 
 #include 
+#endif /* LIBXML_XPATH_ENABLED */
 
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 #ifdef __cplusplus
 extern "C" {
 #endif
-
+#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED */
+	
+#ifdef LIBXML_XPATH_ENABLED
 typedef struct _xmlXPathContext xmlXPathContext;
 typedef xmlXPathContext *xmlXPathContextPtr;
 typedef struct _xmlXPathParserContext xmlXPathParserContext;
@@ -366,11 +370,6 @@ XMLPUBVAR double xmlXPathNAN;
 XMLPUBVAR double xmlXPathPINF;
 XMLPUBVAR double xmlXPathNINF;
 
-XMLPUBFUN int XMLCALL
-		xmlXPathIsNaN	(double val);
-XMLPUBFUN int XMLCALL
-		xmlXPathIsInf	(double val);
-
 /* These macros may later turn into functions */
 /**
  * xmlXPathNodeSetGetLength:
@@ -465,8 +464,6 @@ XMLPUBFUN xmlXPathObjectPtr XMLCALL
 /**
  * Context handling.
  */
-XMLPUBFUN void XMLCALL		   
-		    xmlXPathInit		(void);
 XMLPUBFUN xmlXPathContextPtr XMLCALL 
 		    xmlXPathNewContext		(xmlDocPtr doc);
 XMLPUBFUN void XMLCALL		   
@@ -499,9 +496,18 @@ XMLPUBFUN xmlXPathObjectPtr XMLCALL
 						 xmlXPathContextPtr ctx);
 XMLPUBFUN void XMLCALL                
 		    xmlXPathFreeCompExpr	(xmlXPathCompExprPtr comp);
+#endif /* LIBXML_XPATH_ENABLED */
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN void XMLCALL		   
+		    xmlXPathInit		(void);
+XMLPUBFUN int XMLCALL
+		xmlXPathIsNaN	(double val);
+XMLPUBFUN int XMLCALL
+		xmlXPathIsInf	(double val);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* LIBXML_XPATH_ENABLED */
+#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED*/
 #endif /* ! __XML_XPATH_H__ */
diff --git a/testSAX.c b/testSAX.c
index c18dd0ad..36fb12d9 100644
--- a/testSAX.c
+++ b/testSAX.c
@@ -1004,6 +1004,7 @@ static void
 parseAndPrintFile(char *filename) {
     int res;
 
+#ifdef LIBXML_PUSH_ENABLED
     if (push) {
 	FILE *f;
 
@@ -1071,6 +1072,7 @@ parseAndPrintFile(char *filename) {
 	    fclose(f);
 	}
     } else {
+#endif /* LIBXML_PUSH_ENABLED */
 	if (!speed) {
 	    /*
 	     * Empty callbacks for checking
@@ -1118,7 +1120,9 @@ parseAndPrintFile(char *filename) {
 		fprintf(stdout, "xmlSAXUserParseFile returned error %d\n", res);
 	    }
 	}
+#ifdef LIBXML_PUSH_ENABLED
     }
+#endif
 }
 
 
@@ -1138,7 +1142,11 @@ int main(int argc, char **argv) {
 	    recovery++;
 	else if ((!strcmp(argv[i], "-push")) ||
 	         (!strcmp(argv[i], "--push")))
+#ifdef LIBXML_PUSH_ENABLED
 	    push++;
+#else
+	    fprintf(stderr,"'push' not enabled in library - ignoring\n");
+#endif /* LIBXML_PUSH_ENABLED */
 	else if ((!strcmp(argv[i], "-speed")) ||
 	         (!strcmp(argv[i], "--speed")))
 	    speed++;
diff --git a/testapi.c b/testapi.c
index c0f8025e..0cb305b5 100644
--- a/testapi.c
+++ b/testapi.c
@@ -1181,7 +1181,7 @@ static int
 test_UTF8ToHtml(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     unsigned char * out; /* a pointer to an array of bytes to store the result */
@@ -1246,7 +1246,7 @@ static int
 test_htmlAttrAllowed(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlStatus ret_val;
     htmlElemDesc * elt; /* HTML element */
@@ -1304,7 +1304,7 @@ static int
 test_htmlAutoCloseTag(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     htmlDocPtr doc; /* the HTML document */
@@ -1352,7 +1352,7 @@ static int
 test_htmlCreateMemoryParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlParserCtxtPtr ret_val;
     char * buffer; /* a pointer to a char array */
@@ -1403,8 +1403,7 @@ static int
 test_htmlCreatePushParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_PUSH_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_PUSH_ENABLED)
     int mem_base;
     htmlParserCtxtPtr ret_val;
     htmlSAXHandlerPtr sax; /* a SAX handler */
@@ -1463,7 +1462,6 @@ test_htmlCreatePushParserCtxt(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -1474,7 +1472,7 @@ static int
 test_htmlCtxtReadDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
@@ -1536,7 +1534,7 @@ static int
 test_htmlCtxtReadFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     htmlDocPtr ret_val;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
     int n_ctxt;
@@ -1579,7 +1577,7 @@ static int
 test_htmlCtxtReadMemory(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
@@ -1648,7 +1646,7 @@ static int
 test_htmlCtxtReset(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
     int n_ctxt;
@@ -1680,7 +1678,7 @@ static int
 test_htmlCtxtUseOptions(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
@@ -1721,7 +1719,7 @@ static int
 test_htmlElementAllowedHere(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     htmlElemDesc * parent; /* HTML parent element */
@@ -1762,7 +1760,7 @@ static int
 test_htmlElementStatusHere(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlStatus ret_val;
     htmlElemDesc * parent; /* HTML parent element */
@@ -1803,7 +1801,7 @@ static int
 test_htmlEncodeEntities(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     unsigned char * out; /* a pointer to an array of bytes to store the result */
@@ -1865,7 +1863,7 @@ static int
 test_htmlEntityLookup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     const htmlEntityDesc * ret_val;
     xmlChar * name; /* the entity name */
@@ -1899,7 +1897,7 @@ static int
 test_htmlEntityValueLookup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     const htmlEntityDesc * ret_val;
     unsigned int value; /* the entity's unicode value */
@@ -1933,7 +1931,7 @@ static int
 test_htmlHandleOmittedElem(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     int val; /* int 0 or 1 */
@@ -1967,7 +1965,7 @@ static int
 test_htmlIsAutoClosed(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     htmlDocPtr doc; /* the HTML document */
@@ -2008,7 +2006,7 @@ static int
 test_htmlIsScriptAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     xmlChar * name; /* an attribute name */
@@ -2042,7 +2040,7 @@ static int
 test_htmlNodeStatus(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlStatus ret_val;
     htmlNodePtr node; /* an htmlNodePtr in a tree */
@@ -2083,7 +2081,7 @@ static int
 test_htmlParseCharRef(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
@@ -2117,8 +2115,7 @@ static int
 test_htmlParseChunk(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_PUSH_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_PUSH_ENABLED)
     int mem_base;
     int ret_val;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
@@ -2164,7 +2161,6 @@ test_htmlParseChunk(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -2175,7 +2171,7 @@ static int
 test_htmlParseDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     xmlChar * cur; /* a pointer to an array of xmlChar */
@@ -2216,7 +2212,7 @@ static int
 test_htmlParseDocument(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
@@ -2251,7 +2247,7 @@ static int
 test_htmlParseElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
     int n_ctxt;
@@ -2283,7 +2279,7 @@ static int
 test_htmlParseEntityRef(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     const htmlEntityDesc * ret_val;
     htmlParserCtxtPtr ctxt; /* an HTML parser context */
@@ -2324,7 +2320,7 @@ static int
 test_htmlParseFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     htmlDocPtr ret_val;
     const char * filename; /* the filename */
     int n_filename;
@@ -2355,7 +2351,7 @@ static int
 test_htmlReadDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     xmlChar * cur; /* a pointer to a zero terminated string */
@@ -2410,7 +2406,7 @@ static int
 test_htmlReadFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     const char * filename; /* a file or URL */
@@ -2458,7 +2454,7 @@ static int
 test_htmlReadMemory(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     char * buffer; /* a pointer to a char array */
@@ -2520,7 +2516,7 @@ static int
 test_htmlSAXParseDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     xmlChar * cur; /* a pointer to an array of xmlChar */
@@ -2575,7 +2571,7 @@ static int
 test_htmlSAXParseFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     const char * filename; /* the filename */
@@ -2682,8 +2678,7 @@ static int
 test_htmlDocContentDumpFormatOutput(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlOutputBufferPtr buf; /* the HTML buffer output */
     int n_buf;
@@ -2726,7 +2721,6 @@ test_htmlDocContentDumpFormatOutput(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -2737,8 +2731,7 @@ static int
 test_htmlDocContentDumpOutput(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlOutputBufferPtr buf; /* the HTML buffer output */
     int n_buf;
@@ -2774,7 +2767,6 @@ test_htmlDocContentDumpOutput(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -2785,8 +2777,7 @@ static int
 test_htmlDocDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     FILE * f; /* the FILE* */
@@ -2817,7 +2808,6 @@ test_htmlDocDump(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -2835,8 +2825,7 @@ static int
 test_htmlDocDumpMemory(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlDocPtr cur; /* the document */
     int n_cur;
@@ -2872,7 +2861,6 @@ test_htmlDocDumpMemory(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -2883,7 +2871,7 @@ static int
 test_htmlGetMetaEncoding(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     htmlDocPtr doc; /* the document */
@@ -2917,7 +2905,7 @@ static int
 test_htmlIsBooleanAttr(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     xmlChar * name; /* the name of the attribute to check */
@@ -2951,7 +2939,7 @@ static int
 test_htmlNewDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     xmlChar * URI; /* URI for the dtd, or NULL */
@@ -2992,7 +2980,7 @@ static int
 test_htmlNewDocNoDtD(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlDocPtr ret_val;
     xmlChar * URI; /* URI for the dtd, or NULL */
@@ -3033,8 +3021,7 @@ static int
 test_htmlNodeDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlBufferPtr buf; /* the HTML buffer output */
@@ -3072,7 +3059,6 @@ test_htmlNodeDump(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -3083,8 +3069,7 @@ static int
 test_htmlNodeDumpFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     FILE * out; /* the FILE pointer */
     int n_out;
@@ -3120,7 +3105,6 @@ test_htmlNodeDumpFile(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -3131,8 +3115,7 @@ static int
 test_htmlNodeDumpFileFormat(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     FILE * out; /* the FILE pointer */
@@ -3184,7 +3167,6 @@ test_htmlNodeDumpFileFormat(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -3195,8 +3177,7 @@ static int
 test_htmlNodeDumpFormatOutput(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlOutputBufferPtr buf; /* the HTML buffer output */
     int n_buf;
@@ -3246,7 +3227,6 @@ test_htmlNodeDumpFormatOutput(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -3257,8 +3237,7 @@ static int
 test_htmlNodeDumpOutput(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlOutputBufferPtr buf; /* the HTML buffer output */
     int n_buf;
@@ -3301,7 +3280,6 @@ test_htmlNodeDumpOutput(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -3312,8 +3290,7 @@ static int
 test_htmlSaveFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     const char * filename; /* the filename (or URL) */
@@ -3344,7 +3321,6 @@ test_htmlSaveFile(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -3355,8 +3331,7 @@ static int
 test_htmlSaveFileEnc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     const char * filename; /* the filename */
@@ -3394,7 +3369,6 @@ test_htmlSaveFileEnc(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -3405,8 +3379,7 @@ static int
 test_htmlSaveFileFormat(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     const char * filename; /* the filename */
@@ -3451,7 +3424,6 @@ test_htmlSaveFileFormat(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -3462,7 +3434,7 @@ static int
 test_htmlSetMetaEncoding(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     int ret_val;
     htmlDocPtr doc; /* the document */
@@ -3530,6 +3502,7 @@ static int
 test_docbDefaultSAXHandlerInit(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_DOCB_ENABLED)
 #ifdef LIBXML_DOCB_ENABLED
     int mem_base;
 
@@ -3545,6 +3518,7 @@ test_docbDefaultSAXHandlerInit(void) {
             printf("\n");
         }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -3555,6 +3529,7 @@ static int
 test_htmlDefaultSAXHandlerInit(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_HTML_ENABLED)
 #ifdef LIBXML_HTML_ENABLED
     int mem_base;
 
@@ -3570,6 +3545,7 @@ test_htmlDefaultSAXHandlerInit(void) {
             printf("\n");
         }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -3888,6 +3864,7 @@ static int
 test_xmlSAX2EndElement(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     void * ctx; /* the user data (XML parser context) */
@@ -3917,6 +3894,7 @@ test_xmlSAX2EndElement(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -4452,7 +4430,7 @@ static int
 test_xmlSAX2InitDocbDefaultSAXHandler(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DOCB_ENABLED
+#if defined(LIBXML_DOCB_ENABLED)
     int mem_base;
     xmlSAXHandler * hdlr; /* the SAX handler */
     int n_hdlr;
@@ -4484,7 +4462,7 @@ static int
 test_xmlSAX2InitHtmlDefaultSAXHandler(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     xmlSAXHandler * hdlr; /* the SAX handler */
     int n_hdlr;
@@ -4851,6 +4829,7 @@ static int
 test_xmlSAX2StartElement(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     void * ctx; /* the user data (XML parser context) */
@@ -4887,6 +4866,7 @@ test_xmlSAX2StartElement(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -5041,6 +5021,7 @@ static int
 test_xmlSAXDefaultVersion(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     int ret_val;
@@ -5065,6 +5046,7 @@ test_xmlSAXDefaultVersion(void) {
         }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -5162,8 +5144,7 @@ static int
 test_xmlC14NDocDumpMemory(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_C14N_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlDocPtr doc; /* the XML document for canonization */
@@ -5222,7 +5203,6 @@ test_xmlC14NDocDumpMemory(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -5233,8 +5213,7 @@ static int
 test_xmlC14NDocSave(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_C14N_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlDocPtr doc; /* the XML document for canonization */
@@ -5300,7 +5279,6 @@ test_xmlC14NDocSave(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -5311,8 +5289,7 @@ static int
 test_xmlC14NDocSaveTo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_C14N_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlDocPtr doc; /* the XML document for canonization */
@@ -5371,7 +5348,6 @@ test_xmlC14NDocSaveTo(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -5416,7 +5392,7 @@ static int
 test_xmlACatalogAdd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     int ret_val;
     xmlCatalogPtr catal; /* a Catalog */
@@ -5471,8 +5447,7 @@ static int
 test_xmlACatalogDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlCatalogPtr catal; /* a Catalog */
     int n_catal;
@@ -5501,7 +5476,6 @@ test_xmlACatalogDump(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -5512,7 +5486,7 @@ static int
 test_xmlACatalogRemove(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     int ret_val;
     xmlCatalogPtr catal; /* a Catalog */
@@ -5553,7 +5527,7 @@ static int
 test_xmlACatalogResolve(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlCatalogPtr catal; /* a Catalog */
@@ -5601,7 +5575,7 @@ static int
 test_xmlACatalogResolvePublic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlCatalogPtr catal; /* a Catalog */
@@ -5642,7 +5616,7 @@ static int
 test_xmlACatalogResolveSystem(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlCatalogPtr catal; /* a Catalog */
@@ -5683,7 +5657,7 @@ static int
 test_xmlACatalogResolveURI(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlCatalogPtr catal; /* a Catalog */
@@ -5724,7 +5698,7 @@ static int
 test_xmlCatalogAdd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     int ret_val;
     xmlChar * type; /* the type of record to add to the catalog */
@@ -5772,7 +5746,7 @@ static int
 test_xmlCatalogCleanup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
 
 
         xmlCatalogCleanup();
@@ -5789,7 +5763,7 @@ static int
 test_xmlCatalogConvert(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int ret_val;
 
 
@@ -5808,8 +5782,7 @@ static int
 test_xmlCatalogDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     FILE * out; /* the file. */
     int n_out;
@@ -5831,7 +5804,6 @@ test_xmlCatalogDump(void) {
         }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -5842,7 +5814,7 @@ static int
 test_xmlCatalogGetDefaults(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlCatalogAllow ret_val;
 
@@ -5869,7 +5841,7 @@ static int
 test_xmlCatalogIsEmpty(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     int ret_val;
     xmlCatalogPtr catal; /* should this create an SGML catalog */
@@ -5903,7 +5875,7 @@ static int
 test_xmlCatalogLocalResolve(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     void * catalogs; /* a document's list of catalogs */
@@ -5951,7 +5923,7 @@ static int
 test_xmlCatalogLocalResolveURI(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     void * catalogs; /* a document's list of catalogs */
@@ -5992,7 +5964,7 @@ static int
 test_xmlCatalogRemove(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int ret_val;
     xmlChar * value; /* the value to remove */
     int n_value;
@@ -6017,7 +5989,7 @@ static int
 test_xmlCatalogResolve(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlChar * pubID; /* the public ID string */
@@ -6058,7 +6030,7 @@ static int
 test_xmlCatalogResolvePublic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlChar * pubID; /* the public ID string */
@@ -6092,7 +6064,7 @@ static int
 test_xmlCatalogResolveSystem(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlChar * sysID; /* the system ID string */
@@ -6126,7 +6098,7 @@ static int
 test_xmlCatalogResolveURI(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlChar * URI; /* the URI */
@@ -6160,7 +6132,7 @@ static int
 test_xmlCatalogSetDefaultPrefer(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlCatalogPrefer ret_val;
     xmlCatalogPrefer prefer; /* the default preference for delegation */
@@ -6194,7 +6166,7 @@ static int
 test_xmlCatalogSetDefaults(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlCatalogAllow allow; /* what catalogs should be accepted */
     int n_allow;
@@ -6226,7 +6198,7 @@ static int
 test_xmlConvertSGMLCatalog(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     int ret_val;
     xmlCatalogPtr catal; /* the catalog */
@@ -6260,7 +6232,7 @@ static int
 test_xmlInitializeCatalog(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -6295,7 +6267,7 @@ static int
 test_xmlLoadCatalog(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int ret_val;
     const char * filename; /* a file path */
     int n_filename;
@@ -6320,7 +6292,7 @@ static int
 test_xmlLoadCatalogs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     char * pathss; /* a list of directories separated by a colon or a space. */
     int n_pathss;
 
@@ -6363,7 +6335,7 @@ static int
 test_xmlParseCatalogFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_CATALOG_ENABLED
+#if defined(LIBXML_CATALOG_ENABLED)
     int mem_base;
     xmlDocPtr ret_val;
     const char * filename; /* the filename */
@@ -6758,7 +6730,7 @@ static int
 test_xmlBoolToText(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     const char * ret_val;
     int boolval; /* a bool to turn into text */
@@ -6792,7 +6764,7 @@ static int
 test_xmlDebugCheckDocument(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     int ret_val;
     FILE * output; /* the FILE * for the output */
@@ -6833,7 +6805,7 @@ static int
 test_xmlDebugDumpAttr(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -6879,7 +6851,7 @@ static int
 test_xmlDebugDumpAttrList(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -6925,7 +6897,7 @@ static int
 test_xmlDebugDumpDTD(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -6964,7 +6936,7 @@ static int
 test_xmlDebugDumpDocument(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -7003,7 +6975,7 @@ static int
 test_xmlDebugDumpDocumentHead(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -7042,7 +7014,7 @@ static int
 test_xmlDebugDumpEntities(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -7081,7 +7053,7 @@ static int
 test_xmlDebugDumpNode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -7127,7 +7099,7 @@ static int
 test_xmlDebugDumpNodeList(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -7173,7 +7145,7 @@ static int
 test_xmlDebugDumpOneNode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -7219,7 +7191,7 @@ static int
 test_xmlDebugDumpString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -7258,7 +7230,7 @@ static int
 test_xmlLsCountNode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     int ret_val;
     xmlNodePtr node; /* the node to count */
@@ -7292,7 +7264,7 @@ static int
 test_xmlLsOneNode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -7348,8 +7320,7 @@ static int
 test_xmlShellBase(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7394,7 +7365,6 @@ test_xmlShellBase(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -7405,8 +7375,7 @@ static int
 test_xmlShellCat(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7451,7 +7420,6 @@ test_xmlShellCat(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -7462,8 +7430,7 @@ static int
 test_xmlShellDir(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7508,7 +7475,6 @@ test_xmlShellDir(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -7519,8 +7485,7 @@ static int
 test_xmlShellDu(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7565,7 +7530,6 @@ test_xmlShellDu(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -7576,8 +7540,7 @@ static int
 test_xmlShellList(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7622,7 +7585,6 @@ test_xmlShellList(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -7633,8 +7595,7 @@ static int
 test_xmlShellLoad(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7679,7 +7640,6 @@ test_xmlShellLoad(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -7690,8 +7650,7 @@ static int
 test_xmlShellPrintXPathResult(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr list; /* a valid result generated by an xpath evaluation */
     int n_list;
@@ -7713,7 +7672,6 @@ test_xmlShellPrintXPathResult(void) {
         }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -7724,8 +7682,7 @@ static int
 test_xmlShellPwd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7770,7 +7727,6 @@ test_xmlShellPwd(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -7781,9 +7737,7 @@ static int
 test_xmlShellSave(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7828,8 +7782,6 @@ test_xmlShellSave(void) {
     }
     }
     function_tests++;
-#endif
-#endif
 #endif
 
     return(test_ret);
@@ -7840,8 +7792,7 @@ static int
 test_xmlShellValidate(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7886,7 +7837,6 @@ test_xmlShellValidate(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -7897,9 +7847,7 @@ static int
 test_xmlShellWrite(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_DEBUG_ENABLED
-#ifdef LIBXML_XPATH_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlShellCtxtPtr ctxt; /* the shell context */
@@ -7944,8 +7892,6 @@ test_xmlShellWrite(void) {
     }
     }
     function_tests++;
-#endif
-#endif
 #endif
 
     return(test_ret);
@@ -8309,6 +8255,7 @@ static int
 test_UTF8Toisolat1(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_OUTPUT_ENABLED)
 #ifdef LIBXML_OUTPUT_ENABLED
     int mem_base;
     int ret_val;
@@ -8354,6 +8301,7 @@ test_UTF8Toisolat1(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -9073,6 +9021,7 @@ static int
 test_xmlCleanupPredefinedEntities(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_LEGACY_ENABLED)
 #ifdef LIBXML_LEGACY_ENABLED
     int mem_base;
 
@@ -9088,6 +9037,7 @@ test_xmlCleanupPredefinedEntities(void) {
             printf("\n");
         }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -9125,7 +9075,7 @@ static int
 test_xmlDumpEntitiesTable(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlBufferPtr buf; /* An XML buffer. */
     int n_buf;
@@ -9171,7 +9121,7 @@ static int
 test_xmlDumpEntityDecl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlBufferPtr buf; /* An XML buffer. */
     int n_buf;
@@ -9437,6 +9387,7 @@ static int
 test_xmlInitializePredefinedEntities(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_LEGACY_ENABLED)
 #ifdef LIBXML_LEGACY_ENABLED
     int mem_base;
 
@@ -9452,6 +9403,7 @@ test_xmlInitializePredefinedEntities(void) {
             printf("\n");
         }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -11208,7 +11160,7 @@ static int
 test_xmlNanoFTPCheckResponse(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* an FTP context */
@@ -11242,7 +11194,7 @@ static int
 test_xmlNanoFTPCleanup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -11267,7 +11219,7 @@ static int
 test_xmlNanoFTPCloseConnection(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* an FTP context */
@@ -11301,7 +11253,7 @@ static int
 test_xmlNanoFTPCwd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* an FTP context */
@@ -11342,7 +11294,7 @@ static int
 test_xmlNanoFTPDele(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* an FTP context */
@@ -11393,7 +11345,7 @@ static int
 test_xmlNanoFTPGetConnection(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* an FTP context */
@@ -11427,7 +11379,7 @@ static int
 test_xmlNanoFTPGetResponse(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* an FTP context */
@@ -11461,7 +11413,7 @@ static int
 test_xmlNanoFTPGetSocket(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* an FTP context */
@@ -11502,7 +11454,7 @@ static int
 test_xmlNanoFTPInit(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -11547,7 +11499,7 @@ static int
 test_xmlNanoFTPOpen(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     void * ret_val;
     const char * URL; /* the URL to the resource */
@@ -11581,7 +11533,7 @@ static int
 test_xmlNanoFTPProxy(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     char * host; /* the proxy host name */
     int n_host;
     int port; /* the proxy port */
@@ -11628,7 +11580,7 @@ static int
 test_xmlNanoFTPQuit(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* an FTP context */
@@ -11662,7 +11614,7 @@ static int
 test_xmlNanoFTPRead(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* the FTP context */
@@ -11710,7 +11662,7 @@ static int
 test_xmlNanoFTPScanProxy(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     const char * URL; /* The proxy URL used to initialize the proxy context */
     int n_URL;
 
@@ -11733,7 +11685,7 @@ static int
 test_xmlNanoFTPUpdateURL(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* an FTP context */
@@ -11802,7 +11754,7 @@ static int
 test_xmlNanoHTTPAuthHeader(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     const char * ret_val;
     void * ctx; /* the HTTP context */
@@ -11836,7 +11788,7 @@ static int
 test_xmlNanoHTTPCleanup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -11861,7 +11813,7 @@ static int
 test_xmlNanoHTTPClose(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     void * ctx; /* the HTTP context */
     int n_ctx;
@@ -11893,7 +11845,7 @@ static int
 test_xmlNanoHTTPContentLength(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* the HTTP context */
@@ -11927,7 +11879,7 @@ static int
 test_xmlNanoHTTPEncoding(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     const char * ret_val;
     void * ctx; /* the HTTP context */
@@ -11968,7 +11920,7 @@ static int
 test_xmlNanoHTTPFetch(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     int ret_val;
     const char * URL; /* The URL to load */
@@ -12016,7 +11968,7 @@ static int
 test_xmlNanoHTTPInit(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -12041,7 +11993,7 @@ static int
 test_xmlNanoHTTPMethod(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     void * ret_val;
     const char * URL; /* The URL to load */
@@ -12110,7 +12062,7 @@ static int
 test_xmlNanoHTTPMethodRedir(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     void * ret_val;
     const char * URL; /* The URL to load */
@@ -12186,7 +12138,7 @@ static int
 test_xmlNanoHTTPMimeType(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     const char * ret_val;
     void * ctx; /* the HTTP context */
@@ -12220,7 +12172,7 @@ static int
 test_xmlNanoHTTPOpen(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     void * ret_val;
     const char * URL; /* The URL to load */
@@ -12261,7 +12213,7 @@ static int
 test_xmlNanoHTTPOpenRedir(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     void * ret_val;
     const char * URL; /* The URL to load */
@@ -12309,7 +12261,7 @@ static int
 test_xmlNanoHTTPRead(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* the HTTP context */
@@ -12367,7 +12319,7 @@ static int
 test_xmlNanoHTTPReturnCode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     int ret_val;
     void * ctx; /* the HTTP context */
@@ -12401,8 +12353,7 @@ static int
 test_xmlNanoHTTPSave(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_HTTP_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     void * ctxt; /* the HTTP context */
@@ -12433,7 +12384,6 @@ test_xmlNanoHTTPSave(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -12444,7 +12394,7 @@ static int
 test_xmlNanoHTTPScanProxy(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     const char * URL; /* The proxy URL used to initialize the proxy context */
     int n_URL;
 
@@ -12618,7 +12568,7 @@ static int
 test_xmlCreatePushParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_PUSH_ENABLED
+#if defined(LIBXML_PUSH_ENABLED)
     int mem_base;
     xmlParserCtxtPtr ret_val;
     xmlSAXHandlerPtr sax; /* a SAX handler */
@@ -12999,6 +12949,7 @@ static int
 test_xmlGetFeature(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_LEGACY_ENABLED)
 #ifdef LIBXML_LEGACY_ENABLED
     int mem_base;
     int ret_val;
@@ -13037,6 +12988,7 @@ test_xmlGetFeature(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -13054,6 +13006,7 @@ static int
 test_xmlGetFeaturesList(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_LEGACY_ENABLED)
 #ifdef LIBXML_LEGACY_ENABLED
     int mem_base;
     int ret_val;
@@ -13085,6 +13038,7 @@ test_xmlGetFeaturesList(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -13095,6 +13049,7 @@ static int
 test_xmlIOParseDTD(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_VALID_ENABLED)
 #ifdef LIBXML_VALID_ENABLED
     int mem_base;
     xmlDtdPtr ret_val;
@@ -13134,6 +13089,7 @@ test_xmlIOParseDTD(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -13418,6 +13374,7 @@ static int
 test_xmlParseBalancedChunkMemory(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     int ret_val;
@@ -13482,6 +13439,7 @@ test_xmlParseBalancedChunkMemory(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -13492,6 +13450,7 @@ static int
 test_xmlParseBalancedChunkMemoryRecover(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     int ret_val;
@@ -13563,6 +13522,7 @@ test_xmlParseBalancedChunkMemoryRecover(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -13573,7 +13533,7 @@ static int
 test_xmlParseChunk(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_PUSH_ENABLED
+#if defined(LIBXML_PUSH_ENABLED)
     int mem_base;
     int ret_val;
     xmlParserCtxtPtr ctxt; /* an XML parser context */
@@ -13682,6 +13642,7 @@ static int
 test_xmlParseDTD(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_VALID_ENABLED)
 #ifdef LIBXML_VALID_ENABLED
     int mem_base;
     xmlDtdPtr ret_val;
@@ -13713,6 +13674,7 @@ test_xmlParseDTD(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -13723,6 +13685,7 @@ static int
 test_xmlParseDoc(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -13747,6 +13710,7 @@ test_xmlParseDoc(void) {
         }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -13790,6 +13754,7 @@ static int
 test_xmlParseEntity(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -13814,6 +13779,7 @@ test_xmlParseEntity(void) {
         }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -13857,6 +13823,7 @@ static int
 test_xmlParseExternalEntity(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     int ret_val;
@@ -13923,6 +13890,7 @@ test_xmlParseExternalEntity(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -13933,6 +13901,7 @@ static int
 test_xmlParseFile(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -13957,6 +13926,7 @@ test_xmlParseFile(void) {
         }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14027,6 +13997,7 @@ static int
 test_xmlParseMemory(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14058,6 +14029,7 @@ test_xmlParseMemory(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14487,6 +14459,7 @@ static int
 test_xmlRecoverDoc(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14511,6 +14484,7 @@ test_xmlRecoverDoc(void) {
         }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14521,6 +14495,7 @@ static int
 test_xmlRecoverFile(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14545,6 +14520,7 @@ test_xmlRecoverFile(void) {
         }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14555,6 +14531,7 @@ static int
 test_xmlRecoverMemory(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14586,6 +14563,7 @@ test_xmlRecoverMemory(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14596,6 +14574,7 @@ static int
 test_xmlSAXParseDTD(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_VALID_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDtdPtr ret_val;
@@ -14634,6 +14613,7 @@ test_xmlSAXParseDTD(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14644,6 +14624,7 @@ static int
 test_xmlSAXParseDoc(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14682,6 +14663,7 @@ test_xmlSAXParseDoc(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14692,6 +14674,7 @@ static int
 test_xmlSAXParseEntity(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14723,6 +14706,7 @@ test_xmlSAXParseEntity(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14733,6 +14717,7 @@ static int
 test_xmlSAXParseFile(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14771,6 +14756,7 @@ test_xmlSAXParseFile(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14781,6 +14767,7 @@ static int
 test_xmlSAXParseFileWithData(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14826,6 +14813,7 @@ test_xmlSAXParseFileWithData(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14836,6 +14824,7 @@ static int
 test_xmlSAXParseMemory(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14881,6 +14870,7 @@ test_xmlSAXParseMemory(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14891,6 +14881,7 @@ static int
 test_xmlSAXParseMemoryWithData(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlDocPtr ret_val;
@@ -14943,6 +14934,7 @@ test_xmlSAXParseMemoryWithData(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -14953,6 +14945,7 @@ static int
 test_xmlSAXUserParseFile(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     int ret_val;
@@ -14996,6 +14989,7 @@ test_xmlSAXUserParseFile(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -15006,6 +15000,7 @@ static int
 test_xmlSAXUserParseMemory(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     int ret_val;
@@ -15056,6 +15051,7 @@ test_xmlSAXUserParseMemory(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -15076,6 +15072,7 @@ static int
 test_xmlSetFeature(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_LEGACY_ENABLED)
 #ifdef LIBXML_LEGACY_ENABLED
     int mem_base;
     int ret_val;
@@ -15114,6 +15111,7 @@ test_xmlSetFeature(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -15124,6 +15122,7 @@ static int
 test_xmlSetupParserForBuffer(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_SAX1_ENABLED)
 #ifdef LIBXML_SAX1_ENABLED
     int mem_base;
     xmlParserCtxtPtr ctxt; /* an XML parser context */
@@ -15160,6 +15159,7 @@ test_xmlSetupParserForBuffer(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -15170,6 +15170,7 @@ static int
 test_xmlStopParser(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_PUSH_ENABLED)
 #ifdef LIBXML_PUSH_ENABLED
     int mem_base;
     xmlParserCtxtPtr ctxt; /* an XML parser context */
@@ -15192,6 +15193,7 @@ test_xmlStopParser(void) {
         }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -15306,7 +15308,7 @@ static int
 test_htmlCreateFileParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
     htmlParserCtxtPtr ret_val;
     const char * filename; /* the filename */
@@ -15347,7 +15349,7 @@ static int
 test_htmlInitAutoClose(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTML_ENABLED
+#if defined(LIBXML_HTML_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -16655,7 +16657,7 @@ static int
 test_xmlPatternMatch(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_PATTERN_ENABLED
+#if defined(LIBXML_PATTERN_ENABLED)
     int mem_base;
     int ret_val;
     xmlPatternPtr comp; /* the precompiled pattern */
@@ -16728,8 +16730,7 @@ static int
 test_xmlRelaxNGDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     FILE * output; /* the file output */
     int n_output;
@@ -16758,7 +16759,6 @@ test_xmlRelaxNGDump(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -16769,8 +16769,7 @@ static int
 test_xmlRelaxNGDumpTree(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     FILE * output; /* the file output */
     int n_output;
@@ -16799,7 +16798,6 @@ test_xmlRelaxNGDumpTree(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -16850,7 +16848,7 @@ static int
 test_xmlRelaxNGGetParserErrors(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlRelaxNGParserCtxtPtr ctxt; /* a Relax-NG validation context */
@@ -16915,7 +16913,7 @@ static int
 test_xmlRelaxNGGetValidErrors(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlRelaxNGValidCtxtPtr ctxt; /* a Relax-NG validation context */
@@ -16970,7 +16968,7 @@ static int
 test_xmlRelaxNGInitTypes(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
 
@@ -16997,7 +16995,7 @@ static int
 test_xmlRelaxNGNewDocParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlRelaxNGParserCtxtPtr ret_val;
     xmlDocPtr doc; /* a preparsed document tree */
@@ -17031,7 +17029,7 @@ static int
 test_xmlRelaxNGNewMemParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlRelaxNGParserCtxtPtr ret_val;
     char * buffer; /* a pointer to a char array containing the schemas */
@@ -17072,7 +17070,7 @@ static int
 test_xmlRelaxNGNewParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlRelaxNGParserCtxtPtr ret_val;
     char * URL; /* the location of the schema */
@@ -17146,7 +17144,7 @@ static int
 test_xmlRelaxNGValidateDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlRelaxNGValidCtxtPtr ctxt; /* a Relax-NG validation context */
@@ -17187,7 +17185,7 @@ static int
 test_xmlRelaxNGValidateFullElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlRelaxNGValidCtxtPtr ctxt; /* the validation context */
@@ -17235,7 +17233,7 @@ static int
 test_xmlRelaxNGValidatePopElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlRelaxNGValidCtxtPtr ctxt; /* the RelaxNG validation context */
@@ -17283,7 +17281,7 @@ static int
 test_xmlRelaxNGValidatePushCData(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlRelaxNGValidCtxtPtr ctxt; /* the RelaxNG validation context */
@@ -17331,7 +17329,7 @@ static int
 test_xmlRelaxNGValidatePushElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlRelaxNGValidCtxtPtr ctxt; /* the validation context */
@@ -17379,7 +17377,7 @@ static int
 test_xmlRelaxParserSetFlag(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlRelaxNGParserCtxtPtr ctxt; /* a RelaxNG parser context */
@@ -17578,7 +17576,7 @@ static int
 test_xmlAddPrevSibling(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlNodePtr cur; /* the child node */
@@ -17660,6 +17658,7 @@ static int
 test_xmlAttrSerializeTxtContent(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_OUTPUT_ENABLED)
 #ifdef LIBXML_OUTPUT_ENABLED
     int mem_base;
     xmlBufferPtr buf; /* the XML buffer output */
@@ -17703,6 +17702,7 @@ test_xmlAttrSerializeTxtContent(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -18351,7 +18351,7 @@ static int
 test_xmlCopyDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlDocPtr ret_val;
     xmlDocPtr doc; /* the document */
@@ -18392,7 +18392,7 @@ static int
 test_xmlCopyDtd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
     int mem_base;
     xmlDtdPtr ret_val;
     xmlDtdPtr dtd; /* the dtd */
@@ -18779,7 +18779,7 @@ static int
 test_xmlDocDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     FILE * f; /* the FILE* */
@@ -18820,7 +18820,7 @@ static int
 test_xmlDocDumpFormatMemory(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlDocPtr cur; /* the document */
     int n_cur;
@@ -18873,7 +18873,7 @@ static int
 test_xmlDocDumpFormatMemoryEnc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlDocPtr out_doc; /* Document to generate XML text from */
     int n_out_doc;
@@ -18933,7 +18933,7 @@ static int
 test_xmlDocDumpMemory(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlDocPtr cur; /* the document */
     int n_cur;
@@ -18979,7 +18979,7 @@ static int
 test_xmlDocDumpMemoryEnc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlDocPtr out_doc; /* Document to generate XML text from */
     int n_out_doc;
@@ -19032,7 +19032,7 @@ static int
 test_xmlDocFormatDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     FILE * f; /* the FILE* */
@@ -19112,7 +19112,7 @@ static int
 test_xmlDocSetRootElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlDocPtr doc; /* the document */
@@ -19154,7 +19154,7 @@ static int
 test_xmlElemDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     FILE * f; /* the FILE * for the output */
     int n_f;
@@ -19417,7 +19417,7 @@ static int
 test_xmlGetNodePath(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlNodePtr node; /* a node */
@@ -19787,6 +19787,7 @@ static int
 test_xmlNewChild(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     xmlNodePtr ret_val;
@@ -19832,6 +19833,7 @@ test_xmlNewChild(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -19945,7 +19947,7 @@ static int
 test_xmlNewDocFragment(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlDocPtr doc; /* the document owning the fragment */
@@ -20177,6 +20179,7 @@ static int
 test_xmlNewDocRawNode(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_TREE_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     xmlNodePtr ret_val;
@@ -20222,6 +20225,7 @@ test_xmlNewDocRawNode(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -20640,6 +20644,7 @@ static int
 test_xmlNewProp(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     xmlAttrPtr ret_val;
@@ -20678,6 +20683,7 @@ test_xmlNewProp(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -20759,6 +20765,7 @@ static int
 test_xmlNewTextChild(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_TREE_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     xmlNodePtr ret_val;
@@ -20804,6 +20811,7 @@ test_xmlNewTextChild(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -20973,7 +20981,7 @@ static int
 test_xmlNodeDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlBufferPtr buf; /* the XML buffer output */
@@ -21035,7 +21043,7 @@ static int
 test_xmlNodeDumpOutput(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlOutputBufferPtr buf; /* the XML buffer output */
     int n_buf;
@@ -21269,7 +21277,7 @@ static int
 test_xmlNodeListGetRawString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlDocPtr doc; /* the document */
@@ -21363,7 +21371,7 @@ static int
 test_xmlNodeSetBase(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED)
     int mem_base;
     xmlNodePtr cur; /* the node being changed */
     int n_cur;
@@ -21439,7 +21447,7 @@ static int
 test_xmlNodeSetContentLen(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
     int mem_base;
     xmlNodePtr cur; /* the node being modified */
     int n_cur;
@@ -21485,7 +21493,7 @@ static int
 test_xmlNodeSetLang(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
     int mem_base;
     xmlNodePtr cur; /* the node being changed */
     int n_cur;
@@ -21524,7 +21532,7 @@ static int
 test_xmlNodeSetName(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
     int mem_base;
     xmlNodePtr cur; /* the node being changed */
     int n_cur;
@@ -21563,7 +21571,7 @@ static int
 test_xmlNodeSetSpacePreserve(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
     int mem_base;
     xmlNodePtr cur; /* the node being changed */
     int n_cur;
@@ -21602,6 +21610,7 @@ static int
 test_xmlReconciliateNs(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_TREE_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     int ret_val;
@@ -21633,6 +21642,7 @@ test_xmlReconciliateNs(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -21643,7 +21653,7 @@ static int
 test_xmlRemoveProp(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED)
     int mem_base;
     int ret_val;
     xmlAttrPtr cur; /* an attribute */
@@ -21678,7 +21688,7 @@ static int
 test_xmlReplaceNode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlNodePtr old; /* the old node */
@@ -21726,7 +21736,7 @@ static int
 test_xmlSaveFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     const char * filename; /* the filename (or URL) */
@@ -21767,7 +21777,7 @@ static int
 test_xmlSaveFileEnc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     const char * filename; /* the filename (or URL) */
@@ -21815,7 +21825,7 @@ static int
 test_xmlSaveFileTo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlOutputBufferPtr buf; /* an output I/O buffer */
@@ -21864,7 +21874,7 @@ static int
 test_xmlSaveFormatFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     const char * filename; /* the filename (or URL) */
@@ -21912,7 +21922,7 @@ static int
 test_xmlSaveFormatFileEnc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     const char * filename; /* the filename or URL to output */
@@ -21967,7 +21977,7 @@ static int
 test_xmlSaveFormatFileTo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlOutputBufferPtr buf; /* an output I/O buffer */
@@ -22249,7 +22259,7 @@ static int
 test_xmlSetNsProp(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED)
     int mem_base;
     xmlAttrPtr ret_val;
     xmlNodePtr node; /* the node */
@@ -22304,7 +22314,7 @@ static int
 test_xmlSetProp(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED)
     int mem_base;
     xmlAttrPtr ret_val;
     xmlNodePtr node; /* the node */
@@ -22603,7 +22613,7 @@ static int
 test_xmlUnsetNsProp(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlNodePtr node; /* the node */
@@ -22651,7 +22661,7 @@ static int
 test_xmlUnsetProp(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_TREE_ENABLED
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlNodePtr node; /* the node */
@@ -22692,6 +22702,7 @@ static int
 test_xmlValidateNCName(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     int ret_val;
@@ -22723,6 +22734,7 @@ test_xmlValidateNCName(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -22733,6 +22745,7 @@ static int
 test_xmlValidateNMToken(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     int ret_val;
@@ -22764,6 +22777,7 @@ test_xmlValidateNMToken(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -22774,6 +22788,7 @@ static int
 test_xmlValidateName(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     int ret_val;
@@ -22805,6 +22820,7 @@ test_xmlValidateName(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -22815,6 +22831,7 @@ static int
 test_xmlValidateQName(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     int ret_val;
@@ -22846,6 +22863,7 @@ test_xmlValidateQName(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -23666,7 +23684,7 @@ static int
 test_xmlDumpAttributeDecl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlBufferPtr buf; /* the XML buffer output */
     int n_buf;
@@ -23705,7 +23723,7 @@ static int
 test_xmlDumpAttributeTable(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlBufferPtr buf; /* the XML buffer output */
     int n_buf;
@@ -23751,7 +23769,7 @@ static int
 test_xmlDumpElementDecl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlBufferPtr buf; /* the XML buffer output */
     int n_buf;
@@ -23790,7 +23808,7 @@ static int
 test_xmlDumpElementTable(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlBufferPtr buf; /* the XML buffer output */
     int n_buf;
@@ -23836,7 +23854,7 @@ static int
 test_xmlDumpNotationDecl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlBufferPtr buf; /* the XML buffer output */
     int n_buf;
@@ -23875,7 +23893,7 @@ static int
 test_xmlDumpNotationTable(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlBufferPtr buf; /* the XML buffer output */
     int n_buf;
@@ -24466,6 +24484,7 @@ static int
 test_xmlSprintfElementContent(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_OUTPUT_ENABLED)
 #ifdef LIBXML_OUTPUT_ENABLED
     int mem_base;
     char * buf; /* an output buffer */
@@ -24502,6 +24521,7 @@ test_xmlSprintfElementContent(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -24512,7 +24532,7 @@ static int
 test_xmlValidBuildContentModel(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* a validation context */
@@ -24553,7 +24573,7 @@ static int
 test_xmlValidCtxtNormalizeAttributeValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context or NULL */
@@ -24622,6 +24642,7 @@ static int
 test_xmlValidGetPotentialChildren(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_VALID_ENABLED)
 #ifdef LIBXML_VALID_ENABLED
     int mem_base;
     int ret_val;
@@ -24667,6 +24688,7 @@ test_xmlValidGetPotentialChildren(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -24677,6 +24699,7 @@ static int
 test_xmlValidGetValidElements(void) {
     int test_ret = 0;
 
+#if defined(LIBXML_VALID_ENABLED)
 #ifdef LIBXML_VALID_ENABLED
     int mem_base;
     int ret_val;
@@ -24722,6 +24745,7 @@ test_xmlValidGetValidElements(void) {
     }
     }
     function_tests++;
+#endif
 #endif
 
     return(test_ret);
@@ -24732,7 +24756,7 @@ static int
 test_xmlValidNormalizeAttributeValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlDocPtr doc; /* the document */
@@ -24787,7 +24811,7 @@ static int
 test_xmlValidateAttributeDecl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -24835,7 +24859,7 @@ static int
 test_xmlValidateAttributeValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlAttributeType type; /* an attribute type */
@@ -24876,7 +24900,7 @@ static int
 test_xmlValidateDocument(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -24917,7 +24941,7 @@ static int
 test_xmlValidateDocumentFinal(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -24958,7 +24982,7 @@ static int
 test_xmlValidateDtd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25006,7 +25030,7 @@ static int
 test_xmlValidateDtdFinal(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25047,7 +25071,7 @@ static int
 test_xmlValidateElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25095,7 +25119,7 @@ static int
 test_xmlValidateElementDecl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25143,7 +25167,7 @@ static int
 test_xmlValidateNameValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlChar * value; /* an Name value */
@@ -25177,7 +25201,7 @@ static int
 test_xmlValidateNamesValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlChar * value; /* an Names value */
@@ -25211,7 +25235,7 @@ static int
 test_xmlValidateNmtokenValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlChar * value; /* an Nmtoken value */
@@ -25245,7 +25269,7 @@ static int
 test_xmlValidateNmtokensValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlChar * value; /* an Nmtokens value */
@@ -25279,7 +25303,7 @@ static int
 test_xmlValidateNotationDecl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25327,7 +25351,7 @@ static int
 test_xmlValidateNotationUse(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25375,7 +25399,7 @@ static int
 test_xmlValidateOneAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25437,7 +25461,7 @@ static int
 test_xmlValidateOneElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25485,7 +25509,7 @@ static int
 test_xmlValidateOneNamespace(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25554,7 +25578,7 @@ static int
 test_xmlValidatePopElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25609,7 +25633,7 @@ static int
 test_xmlValidatePushCData(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25657,7 +25681,7 @@ static int
 test_xmlValidatePushElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_VALID_ENABLED) && defined(LIBXML_REGEXP_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25712,7 +25736,7 @@ static int
 test_xmlValidateRoot(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED)
     int mem_base;
     int ret_val;
     xmlValidCtxtPtr ctxt; /* the validation context */
@@ -25832,7 +25856,7 @@ static int
 test_xmlXIncludeProcess(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
     int mem_base;
     int ret_val;
     xmlDocPtr doc; /* an XML document */
@@ -25866,7 +25890,7 @@ static int
 test_xmlXIncludeProcessFlags(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
     int mem_base;
     int ret_val;
     xmlDocPtr doc; /* an XML document */
@@ -25917,7 +25941,7 @@ static int
 test_xmlXIncludeProcessNode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
     int mem_base;
     int ret_val;
     xmlXIncludeCtxtPtr ctxt; /* an existing XInclude context */
@@ -25958,7 +25982,7 @@ static int
 test_xmlXIncludeProcessTree(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
     int mem_base;
     int ret_val;
     xmlNodePtr tree; /* a node in an XML document */
@@ -25992,7 +26016,7 @@ static int
 test_xmlXIncludeProcessTreeFlags(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
     int mem_base;
     int ret_val;
     xmlNodePtr tree; /* a node in an XML document */
@@ -26033,7 +26057,7 @@ static int
 test_xmlXIncludeSetFlags(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#if defined(LIBXML_XINCLUDE_ENABLED)
     int mem_base;
     int ret_val;
     xmlXIncludeCtxtPtr ctxt; /* an XInclude processing context */
@@ -26091,7 +26115,7 @@ static int
 test_xmlAllocOutputBuffer(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlOutputBufferPtr ret_val;
     xmlCharEncodingHandlerPtr encoder; /* the encoding converter or NULL */
@@ -26251,7 +26275,7 @@ static int
 test_xmlCleanupOutputCallbacks(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -26418,7 +26442,7 @@ static int
 test_xmlIOFTPClose(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * context; /* the I/O context */
@@ -26452,7 +26476,7 @@ static int
 test_xmlIOFTPMatch(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     const char * filename; /* the URI for matching */
@@ -26486,7 +26510,7 @@ static int
 test_xmlIOFTPOpen(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     void * ret_val;
     const char * filename; /* the URI for matching */
@@ -26520,7 +26544,7 @@ static int
 test_xmlIOFTPRead(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_FTP_ENABLED
+#if defined(LIBXML_FTP_ENABLED)
     int mem_base;
     int ret_val;
     void * context; /* the I/O context */
@@ -26568,7 +26592,7 @@ static int
 test_xmlIOHTTPClose(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     int ret_val;
     void * context; /* the I/O context */
@@ -26602,7 +26626,7 @@ static int
 test_xmlIOHTTPMatch(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     int ret_val;
     const char * filename; /* the URI for matching */
@@ -26636,7 +26660,7 @@ static int
 test_xmlIOHTTPOpen(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     void * ret_val;
     const char * filename; /* the URI for matching */
@@ -26680,7 +26704,7 @@ static int
 test_xmlIOHTTPRead(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_HTTP_ENABLED)
     int mem_base;
     int ret_val;
     void * context; /* the I/O context */
@@ -26806,7 +26830,7 @@ static int
 test_xmlOutputBufferCreateFd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlOutputBufferPtr ret_val;
     int fd; /* a file descriptor number */
@@ -26847,7 +26871,7 @@ static int
 test_xmlOutputBufferCreateFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlOutputBufferPtr ret_val;
     FILE * file; /* a FILE* */
@@ -26888,7 +26912,7 @@ static int
 test_xmlOutputBufferCreateFilename(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     xmlOutputBufferPtr ret_val;
     const char * URI; /* a C string containing the URI or filename */
@@ -26936,7 +26960,7 @@ static int
 test_xmlOutputBufferFlush(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlOutputBufferPtr out; /* a buffered output */
@@ -26970,7 +26994,7 @@ static int
 test_xmlOutputBufferWrite(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlOutputBufferPtr out; /* a buffered parser output */
@@ -27028,7 +27052,7 @@ static int
 test_xmlOutputBufferWriteString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlOutputBufferPtr out; /* a buffered parser output */
@@ -27461,7 +27485,7 @@ static int
 test_xmlRegisterDefaultOutputCallbacks(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -27486,7 +27510,7 @@ static int
 test_xmlRegisterHTTPPostCallbacks(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_HTTP_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED) && defined(LIBXML_HTTP_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -27592,7 +27616,7 @@ static int
 test_xmlAutomataIsDeterminist(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
     int mem_base;
     int ret_val;
     xmlAutomataPtr am; /* an automata */
@@ -27676,7 +27700,7 @@ static int
 test_xmlAutomataNewCounter(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
     int mem_base;
     int ret_val;
     xmlAutomataPtr am; /* an automata */
@@ -27794,7 +27818,7 @@ static int
 test_xmlAutomataSetFinalState(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_AUTOMATA_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
     int mem_base;
     int ret_val;
     xmlAutomataPtr am; /* an automata */
@@ -28195,7 +28219,7 @@ static int
 test_xmlNewTextReader(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlTextReaderPtr ret_val;
     xmlParserInputBufferPtr input; /* the xmlParserInputBufferPtr used to read data */
@@ -28236,7 +28260,7 @@ static int
 test_xmlNewTextReaderFilename(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlTextReaderPtr ret_val;
     const char * URI; /* the URI of the resource to process */
@@ -28270,7 +28294,7 @@ static int
 test_xmlReaderForDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlTextReaderPtr ret_val;
     xmlChar * cur; /* a pointer to a zero terminated string */
@@ -28325,7 +28349,7 @@ static int
 test_xmlReaderForFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlTextReaderPtr ret_val;
     const char * filename; /* a file or URL */
@@ -28373,7 +28397,7 @@ static int
 test_xmlReaderForMemory(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlTextReaderPtr ret_val;
     char * buffer; /* a pointer to a char array */
@@ -28435,7 +28459,7 @@ static int
 test_xmlReaderNewDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* an XML reader */
@@ -28497,7 +28521,7 @@ static int
 test_xmlReaderNewFile(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* an XML reader */
@@ -28552,7 +28576,7 @@ static int
 test_xmlReaderNewMemory(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* an XML reader */
@@ -28621,7 +28645,7 @@ static int
 test_xmlReaderNewWalker(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* an XML reader */
@@ -28662,7 +28686,7 @@ static int
 test_xmlReaderWalker(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlTextReaderPtr ret_val;
     xmlDocPtr doc; /* a preparsed document */
@@ -28696,7 +28720,7 @@ static int
 test_xmlTextReaderAttributeCount(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -28730,7 +28754,7 @@ static int
 test_xmlTextReaderBaseUri(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -28764,7 +28788,7 @@ static int
 test_xmlTextReaderClose(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -28798,7 +28822,7 @@ static int
 test_xmlTextReaderConstBaseUri(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -28832,7 +28856,7 @@ static int
 test_xmlTextReaderConstEncoding(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -28866,7 +28890,7 @@ static int
 test_xmlTextReaderConstLocalName(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -28900,7 +28924,7 @@ static int
 test_xmlTextReaderConstName(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -28934,7 +28958,7 @@ static int
 test_xmlTextReaderConstNamespaceUri(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -28968,7 +28992,7 @@ static int
 test_xmlTextReaderConstPrefix(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29002,7 +29026,7 @@ static int
 test_xmlTextReaderConstString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29043,7 +29067,7 @@ static int
 test_xmlTextReaderConstValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29077,7 +29101,7 @@ static int
 test_xmlTextReaderConstXmlLang(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29111,7 +29135,7 @@ static int
 test_xmlTextReaderConstXmlVersion(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29145,7 +29169,7 @@ static int
 test_xmlTextReaderCurrentDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlDocPtr ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29179,7 +29203,7 @@ static int
 test_xmlTextReaderCurrentNode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29213,7 +29237,7 @@ static int
 test_xmlTextReaderDepth(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29247,7 +29271,7 @@ static int
 test_xmlTextReaderExpand(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29281,7 +29305,7 @@ static int
 test_xmlTextReaderGetAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29322,7 +29346,7 @@ static int
 test_xmlTextReaderGetAttributeNo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29363,7 +29387,7 @@ static int
 test_xmlTextReaderGetAttributeNs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29421,7 +29445,7 @@ static int
 test_xmlTextReaderGetErrorHandler(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
     int n_reader;
@@ -29467,7 +29491,7 @@ static int
 test_xmlTextReaderGetParserProp(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29508,7 +29532,7 @@ static int
 test_xmlTextReaderGetRemainder(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlParserInputBufferPtr ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29542,7 +29566,7 @@ static int
 test_xmlTextReaderHasAttributes(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29576,7 +29600,7 @@ static int
 test_xmlTextReaderHasValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29610,7 +29634,7 @@ static int
 test_xmlTextReaderIsDefault(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29644,7 +29668,7 @@ static int
 test_xmlTextReaderIsEmptyElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29678,7 +29702,7 @@ static int
 test_xmlTextReaderIsNamespaceDecl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29712,7 +29736,7 @@ static int
 test_xmlTextReaderIsValid(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29746,7 +29770,7 @@ static int
 test_xmlTextReaderLocalName(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29790,7 +29814,7 @@ static int
 test_xmlTextReaderLocatorBaseURI(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderLocatorPtr locator; /* the xmlTextReaderLocatorPtr used */
@@ -29824,7 +29848,7 @@ static int
 test_xmlTextReaderLocatorLineNumber(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderLocatorPtr locator; /* the xmlTextReaderLocatorPtr used */
@@ -29858,7 +29882,7 @@ static int
 test_xmlTextReaderLookupNamespace(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29899,7 +29923,7 @@ static int
 test_xmlTextReaderMoveToAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29940,7 +29964,7 @@ static int
 test_xmlTextReaderMoveToAttributeNo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -29981,7 +30005,7 @@ static int
 test_xmlTextReaderMoveToAttributeNs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30029,7 +30053,7 @@ static int
 test_xmlTextReaderMoveToElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30063,7 +30087,7 @@ static int
 test_xmlTextReaderMoveToFirstAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30097,7 +30121,7 @@ static int
 test_xmlTextReaderMoveToNextAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30131,7 +30155,7 @@ static int
 test_xmlTextReaderName(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30165,7 +30189,7 @@ static int
 test_xmlTextReaderNamespaceUri(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30199,7 +30223,7 @@ static int
 test_xmlTextReaderNext(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30233,7 +30257,7 @@ static int
 test_xmlTextReaderNextSibling(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30267,7 +30291,7 @@ static int
 test_xmlTextReaderNodeType(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30301,7 +30325,7 @@ static int
 test_xmlTextReaderNormalization(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30335,7 +30359,7 @@ static int
 test_xmlTextReaderPrefix(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30369,7 +30393,7 @@ static int
 test_xmlTextReaderPreserve(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30403,7 +30427,7 @@ static int
 test_xmlTextReaderPreservePattern(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_PATTERN_ENABLED)
 #ifdef LIBXML_PATTERN_ENABLED
     int mem_base;
     int ret_val;
@@ -30453,7 +30477,7 @@ static int
 test_xmlTextReaderQuoteChar(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30487,7 +30511,7 @@ static int
 test_xmlTextReaderRead(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30521,7 +30545,7 @@ static int
 test_xmlTextReaderReadAttributeValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30555,7 +30579,7 @@ static int
 test_xmlTextReaderReadState(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30589,8 +30613,7 @@ static int
 test_xmlTextReaderRelaxNGSetSchema(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30621,7 +30644,6 @@ test_xmlTextReaderRelaxNGSetSchema(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -30632,8 +30654,7 @@ static int
 test_xmlTextReaderRelaxNGValidate(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30664,7 +30685,6 @@ test_xmlTextReaderRelaxNGValidate(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -30685,7 +30705,7 @@ static int
 test_xmlTextReaderSetParserProp(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30743,7 +30763,7 @@ static int
 test_xmlTextReaderStandalone(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30777,7 +30797,7 @@ static int
 test_xmlTextReaderValue(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30811,7 +30831,7 @@ static int
 test_xmlTextReaderXmlLang(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_READER_ENABLED
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
@@ -30935,7 +30955,7 @@ static int
 test_xmlRegExecPushString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
     int mem_base;
     int ret_val;
     xmlRegExecCtxtPtr exec; /* a regexp execution context or NULL to indicate the end */
@@ -30983,7 +31003,7 @@ static int
 test_xmlRegExecPushString2(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
     int mem_base;
     int ret_val;
     xmlRegExecCtxtPtr exec; /* a regexp execution context or NULL to indicate the end */
@@ -31068,7 +31088,7 @@ static int
 test_xmlRegexpExec(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
     int mem_base;
     int ret_val;
     xmlRegexpPtr comp; /* the compiled regular expression */
@@ -31109,7 +31129,7 @@ static int
 test_xmlRegexpIsDeterminist(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
     int mem_base;
     int ret_val;
     xmlRegexpPtr comp; /* the compiled regular expression */
@@ -31143,7 +31163,7 @@ static int
 test_xmlRegexpPrint(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_REGEXP_ENABLED
+#if defined(LIBXML_REGEXP_ENABLED)
     int mem_base;
     FILE * output; /* the file for the output debug */
     int n_output;
@@ -31209,7 +31229,7 @@ static int
 test_xmlSaveClose(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlSaveCtxtPtr ctxt; /* a document saving context */
@@ -31243,7 +31263,7 @@ static int
 test_xmlSaveDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     long ret_val;
     xmlSaveCtxtPtr ctxt; /* a document saving context */
@@ -31284,7 +31304,7 @@ static int
 test_xmlSaveFlush(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     int ret_val;
     xmlSaveCtxtPtr ctxt; /* a document saving context */
@@ -31358,7 +31378,7 @@ static int
 test_xmlSaveTree(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     long ret_val;
     xmlSaveCtxtPtr ctxt; /* a document saving context */
@@ -31427,8 +31447,7 @@ static int
 test_xmlSchemaDump(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
-#ifdef LIBXML_OUTPUT_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
     int mem_base;
     FILE * output; /* the file output */
     int n_output;
@@ -31457,7 +31476,6 @@ test_xmlSchemaDump(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -31498,7 +31516,7 @@ static int
 test_xmlSchemaGetParserErrors(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaParserCtxtPtr ctxt; /* a XMl-Schema parser context */
@@ -31563,7 +31581,7 @@ static int
 test_xmlSchemaGetValidErrors(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaValidCtxtPtr ctxt; /* a XML-Schema validation context */
@@ -31618,7 +31636,7 @@ static int
 test_xmlSchemaNewDocParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlSchemaParserCtxtPtr ret_val;
     xmlDocPtr doc; /* a preparsed document tree */
@@ -31652,7 +31670,7 @@ static int
 test_xmlSchemaNewMemParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlSchemaParserCtxtPtr ret_val;
     char * buffer; /* a pointer to a char array containing the schemas */
@@ -31693,7 +31711,7 @@ static int
 test_xmlSchemaNewParserCtxt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlSchemaParserCtxtPtr ret_val;
     char * URL; /* the location of the schema */
@@ -31767,7 +31785,7 @@ static int
 test_xmlSchemaSetValidOptions(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */
@@ -31808,7 +31826,7 @@ static int
 test_xmlSchemaValidCtxtGetOptions(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */
@@ -31842,7 +31860,7 @@ static int
 test_xmlSchemaValidateDoc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */
@@ -31883,7 +31901,7 @@ static int
 test_xmlSchemaValidateOneElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */
@@ -31924,7 +31942,7 @@ static int
 test_xmlSchemaValidateStream(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */
@@ -32031,7 +32049,7 @@ static int
 test_xmlSchemaCheckFacet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaFacetPtr facet; /* the facet */
@@ -32086,7 +32104,7 @@ static int
 test_xmlSchemaCleanupTypes(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -32111,7 +32129,7 @@ static int
 test_xmlSchemaCollapseString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlChar * value; /* a value */
@@ -32155,7 +32173,7 @@ static int
 test_xmlSchemaCompareValues(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaValPtr x; /* a first value */
@@ -32196,7 +32214,7 @@ static int
 test_xmlSchemaGetBuiltInListSimpleTypeItemType(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlSchemaTypePtr ret_val;
     xmlSchemaTypePtr type; /* the built-in simple type. */
@@ -32230,7 +32248,7 @@ static int
 test_xmlSchemaGetBuiltInType(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     xmlSchemaTypePtr ret_val;
     xmlSchemaValType type; /* the type of the built in type */
     int n_type;
@@ -32255,7 +32273,7 @@ static int
 test_xmlSchemaGetFacetValueAsULong(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     unsigned long ret_val;
     xmlSchemaFacetPtr facet; /* an schemas type facet */
@@ -32289,7 +32307,7 @@ static int
 test_xmlSchemaGetPredefinedType(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlSchemaTypePtr ret_val;
     xmlChar * name; /* the type name */
@@ -32330,7 +32348,7 @@ static int
 test_xmlSchemaInitTypes(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
 
 
         xmlSchemaInitTypes();
@@ -32347,7 +32365,7 @@ static int
 test_xmlSchemaIsBuiltInTypeFacet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaTypePtr type; /* the built-in type */
@@ -32408,7 +32426,7 @@ static int
 test_xmlSchemaValPredefTypeNode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaTypePtr type; /* the predefined type */
@@ -32463,7 +32481,7 @@ static int
 test_xmlSchemaValPredefTypeNodeNoNorm(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaTypePtr type; /* the predefined type */
@@ -32518,7 +32536,7 @@ static int
 test_xmlSchemaValidateFacet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaTypePtr base; /* the base type */
@@ -32573,7 +32591,7 @@ static int
 test_xmlSchemaValidateLengthFacet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaTypePtr type; /* the built-in type */
@@ -32635,7 +32653,7 @@ static int
 test_xmlSchemaValidateListSimpleTypeFacet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaFacetPtr facet; /* the facet to check */
@@ -32690,7 +32708,7 @@ static int
 test_xmlSchemaValidatePredefinedType(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     xmlSchemaTypePtr type; /* the predefined type */
@@ -32738,7 +32756,7 @@ static int
 test_xmlSchemaWhiteSpaceReplace(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlChar * value; /* a value */
@@ -33872,7 +33890,7 @@ static int
 test_xmlUCSIsAegeanNumbers(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -33906,7 +33924,7 @@ static int
 test_xmlUCSIsAlphabeticPresentationForms(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -33940,7 +33958,7 @@ static int
 test_xmlUCSIsArabic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -33974,7 +33992,7 @@ static int
 test_xmlUCSIsArabicPresentationFormsA(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34008,7 +34026,7 @@ static int
 test_xmlUCSIsArabicPresentationFormsB(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34042,7 +34060,7 @@ static int
 test_xmlUCSIsArmenian(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34076,7 +34094,7 @@ static int
 test_xmlUCSIsArrows(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34110,7 +34128,7 @@ static int
 test_xmlUCSIsBasicLatin(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34144,7 +34162,7 @@ static int
 test_xmlUCSIsBengali(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34178,7 +34196,7 @@ static int
 test_xmlUCSIsBlock(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34219,7 +34237,7 @@ static int
 test_xmlUCSIsBlockElements(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34253,7 +34271,7 @@ static int
 test_xmlUCSIsBopomofo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34287,7 +34305,7 @@ static int
 test_xmlUCSIsBopomofoExtended(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34321,7 +34339,7 @@ static int
 test_xmlUCSIsBoxDrawing(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34355,7 +34373,7 @@ static int
 test_xmlUCSIsBraillePatterns(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34389,7 +34407,7 @@ static int
 test_xmlUCSIsBuhid(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34423,7 +34441,7 @@ static int
 test_xmlUCSIsByzantineMusicalSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34457,7 +34475,7 @@ static int
 test_xmlUCSIsCJKCompatibility(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34491,7 +34509,7 @@ static int
 test_xmlUCSIsCJKCompatibilityForms(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34525,7 +34543,7 @@ static int
 test_xmlUCSIsCJKCompatibilityIdeographs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34559,7 +34577,7 @@ static int
 test_xmlUCSIsCJKCompatibilityIdeographsSupplement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34593,7 +34611,7 @@ static int
 test_xmlUCSIsCJKRadicalsSupplement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34627,7 +34645,7 @@ static int
 test_xmlUCSIsCJKSymbolsandPunctuation(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34661,7 +34679,7 @@ static int
 test_xmlUCSIsCJKUnifiedIdeographs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34695,7 +34713,7 @@ static int
 test_xmlUCSIsCJKUnifiedIdeographsExtensionA(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34729,7 +34747,7 @@ static int
 test_xmlUCSIsCJKUnifiedIdeographsExtensionB(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34763,7 +34781,7 @@ static int
 test_xmlUCSIsCat(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34804,7 +34822,7 @@ static int
 test_xmlUCSIsCatC(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34838,7 +34856,7 @@ static int
 test_xmlUCSIsCatCc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34872,7 +34890,7 @@ static int
 test_xmlUCSIsCatCf(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34906,7 +34924,7 @@ static int
 test_xmlUCSIsCatCo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34940,7 +34958,7 @@ static int
 test_xmlUCSIsCatCs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -34974,7 +34992,7 @@ static int
 test_xmlUCSIsCatL(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35008,7 +35026,7 @@ static int
 test_xmlUCSIsCatLl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35042,7 +35060,7 @@ static int
 test_xmlUCSIsCatLm(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35076,7 +35094,7 @@ static int
 test_xmlUCSIsCatLo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35110,7 +35128,7 @@ static int
 test_xmlUCSIsCatLt(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35144,7 +35162,7 @@ static int
 test_xmlUCSIsCatLu(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35178,7 +35196,7 @@ static int
 test_xmlUCSIsCatM(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35212,7 +35230,7 @@ static int
 test_xmlUCSIsCatMc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35246,7 +35264,7 @@ static int
 test_xmlUCSIsCatMe(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35280,7 +35298,7 @@ static int
 test_xmlUCSIsCatMn(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35314,7 +35332,7 @@ static int
 test_xmlUCSIsCatN(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35348,7 +35366,7 @@ static int
 test_xmlUCSIsCatNd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35382,7 +35400,7 @@ static int
 test_xmlUCSIsCatNl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35416,7 +35434,7 @@ static int
 test_xmlUCSIsCatNo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35450,7 +35468,7 @@ static int
 test_xmlUCSIsCatP(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35484,7 +35502,7 @@ static int
 test_xmlUCSIsCatPc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35518,7 +35536,7 @@ static int
 test_xmlUCSIsCatPd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35552,7 +35570,7 @@ static int
 test_xmlUCSIsCatPe(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35586,7 +35604,7 @@ static int
 test_xmlUCSIsCatPf(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35620,7 +35638,7 @@ static int
 test_xmlUCSIsCatPi(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35654,7 +35672,7 @@ static int
 test_xmlUCSIsCatPo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35688,7 +35706,7 @@ static int
 test_xmlUCSIsCatPs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35722,7 +35740,7 @@ static int
 test_xmlUCSIsCatS(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35756,7 +35774,7 @@ static int
 test_xmlUCSIsCatSc(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35790,7 +35808,7 @@ static int
 test_xmlUCSIsCatSk(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35824,7 +35842,7 @@ static int
 test_xmlUCSIsCatSm(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35858,7 +35876,7 @@ static int
 test_xmlUCSIsCatSo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35892,7 +35910,7 @@ static int
 test_xmlUCSIsCatZ(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35926,7 +35944,7 @@ static int
 test_xmlUCSIsCatZl(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35960,7 +35978,7 @@ static int
 test_xmlUCSIsCatZp(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -35994,7 +36012,7 @@ static int
 test_xmlUCSIsCatZs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36028,7 +36046,7 @@ static int
 test_xmlUCSIsCherokee(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36062,7 +36080,7 @@ static int
 test_xmlUCSIsCombiningDiacriticalMarks(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36096,7 +36114,7 @@ static int
 test_xmlUCSIsCombiningDiacriticalMarksforSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36130,7 +36148,7 @@ static int
 test_xmlUCSIsCombiningHalfMarks(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36164,7 +36182,7 @@ static int
 test_xmlUCSIsCombiningMarksforSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36198,7 +36216,7 @@ static int
 test_xmlUCSIsControlPictures(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36232,7 +36250,7 @@ static int
 test_xmlUCSIsCurrencySymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36266,7 +36284,7 @@ static int
 test_xmlUCSIsCypriotSyllabary(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36300,7 +36318,7 @@ static int
 test_xmlUCSIsCyrillic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36334,7 +36352,7 @@ static int
 test_xmlUCSIsCyrillicSupplement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36368,7 +36386,7 @@ static int
 test_xmlUCSIsDeseret(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36402,7 +36420,7 @@ static int
 test_xmlUCSIsDevanagari(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36436,7 +36454,7 @@ static int
 test_xmlUCSIsDingbats(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36470,7 +36488,7 @@ static int
 test_xmlUCSIsEnclosedAlphanumerics(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36504,7 +36522,7 @@ static int
 test_xmlUCSIsEnclosedCJKLettersandMonths(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36538,7 +36556,7 @@ static int
 test_xmlUCSIsEthiopic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36572,7 +36590,7 @@ static int
 test_xmlUCSIsGeneralPunctuation(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36606,7 +36624,7 @@ static int
 test_xmlUCSIsGeometricShapes(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36640,7 +36658,7 @@ static int
 test_xmlUCSIsGeorgian(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36674,7 +36692,7 @@ static int
 test_xmlUCSIsGothic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36708,7 +36726,7 @@ static int
 test_xmlUCSIsGreek(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36742,7 +36760,7 @@ static int
 test_xmlUCSIsGreekExtended(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36776,7 +36794,7 @@ static int
 test_xmlUCSIsGreekandCoptic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36810,7 +36828,7 @@ static int
 test_xmlUCSIsGujarati(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36844,7 +36862,7 @@ static int
 test_xmlUCSIsGurmukhi(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36878,7 +36896,7 @@ static int
 test_xmlUCSIsHalfwidthandFullwidthForms(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36912,7 +36930,7 @@ static int
 test_xmlUCSIsHangulCompatibilityJamo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36946,7 +36964,7 @@ static int
 test_xmlUCSIsHangulJamo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -36980,7 +36998,7 @@ static int
 test_xmlUCSIsHangulSyllables(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37014,7 +37032,7 @@ static int
 test_xmlUCSIsHanunoo(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37048,7 +37066,7 @@ static int
 test_xmlUCSIsHebrew(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37082,7 +37100,7 @@ static int
 test_xmlUCSIsHighPrivateUseSurrogates(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37116,7 +37134,7 @@ static int
 test_xmlUCSIsHighSurrogates(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37150,7 +37168,7 @@ static int
 test_xmlUCSIsHiragana(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37184,7 +37202,7 @@ static int
 test_xmlUCSIsIPAExtensions(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37218,7 +37236,7 @@ static int
 test_xmlUCSIsIdeographicDescriptionCharacters(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37252,7 +37270,7 @@ static int
 test_xmlUCSIsKanbun(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37286,7 +37304,7 @@ static int
 test_xmlUCSIsKangxiRadicals(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37320,7 +37338,7 @@ static int
 test_xmlUCSIsKannada(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37354,7 +37372,7 @@ static int
 test_xmlUCSIsKatakana(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37388,7 +37406,7 @@ static int
 test_xmlUCSIsKatakanaPhoneticExtensions(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37422,7 +37440,7 @@ static int
 test_xmlUCSIsKhmer(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37456,7 +37474,7 @@ static int
 test_xmlUCSIsKhmerSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37490,7 +37508,7 @@ static int
 test_xmlUCSIsLao(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37524,7 +37542,7 @@ static int
 test_xmlUCSIsLatin1Supplement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37558,7 +37576,7 @@ static int
 test_xmlUCSIsLatinExtendedA(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37592,7 +37610,7 @@ static int
 test_xmlUCSIsLatinExtendedAdditional(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37626,7 +37644,7 @@ static int
 test_xmlUCSIsLatinExtendedB(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37660,7 +37678,7 @@ static int
 test_xmlUCSIsLetterlikeSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37694,7 +37712,7 @@ static int
 test_xmlUCSIsLimbu(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37728,7 +37746,7 @@ static int
 test_xmlUCSIsLinearBIdeograms(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37762,7 +37780,7 @@ static int
 test_xmlUCSIsLinearBSyllabary(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37796,7 +37814,7 @@ static int
 test_xmlUCSIsLowSurrogates(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37830,7 +37848,7 @@ static int
 test_xmlUCSIsMalayalam(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37864,7 +37882,7 @@ static int
 test_xmlUCSIsMathematicalAlphanumericSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37898,7 +37916,7 @@ static int
 test_xmlUCSIsMathematicalOperators(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37932,7 +37950,7 @@ static int
 test_xmlUCSIsMiscellaneousMathematicalSymbolsA(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -37966,7 +37984,7 @@ static int
 test_xmlUCSIsMiscellaneousMathematicalSymbolsB(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38000,7 +38018,7 @@ static int
 test_xmlUCSIsMiscellaneousSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38034,7 +38052,7 @@ static int
 test_xmlUCSIsMiscellaneousSymbolsandArrows(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38068,7 +38086,7 @@ static int
 test_xmlUCSIsMiscellaneousTechnical(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38102,7 +38120,7 @@ static int
 test_xmlUCSIsMongolian(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38136,7 +38154,7 @@ static int
 test_xmlUCSIsMusicalSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38170,7 +38188,7 @@ static int
 test_xmlUCSIsMyanmar(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38204,7 +38222,7 @@ static int
 test_xmlUCSIsNumberForms(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38238,7 +38256,7 @@ static int
 test_xmlUCSIsOgham(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38272,7 +38290,7 @@ static int
 test_xmlUCSIsOldItalic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38306,7 +38324,7 @@ static int
 test_xmlUCSIsOpticalCharacterRecognition(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38340,7 +38358,7 @@ static int
 test_xmlUCSIsOriya(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38374,7 +38392,7 @@ static int
 test_xmlUCSIsOsmanya(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38408,7 +38426,7 @@ static int
 test_xmlUCSIsPhoneticExtensions(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38442,7 +38460,7 @@ static int
 test_xmlUCSIsPrivateUse(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38476,7 +38494,7 @@ static int
 test_xmlUCSIsPrivateUseArea(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38510,7 +38528,7 @@ static int
 test_xmlUCSIsRunic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38544,7 +38562,7 @@ static int
 test_xmlUCSIsShavian(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38578,7 +38596,7 @@ static int
 test_xmlUCSIsSinhala(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38612,7 +38630,7 @@ static int
 test_xmlUCSIsSmallFormVariants(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38646,7 +38664,7 @@ static int
 test_xmlUCSIsSpacingModifierLetters(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38680,7 +38698,7 @@ static int
 test_xmlUCSIsSpecials(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38714,7 +38732,7 @@ static int
 test_xmlUCSIsSuperscriptsandSubscripts(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38748,7 +38766,7 @@ static int
 test_xmlUCSIsSupplementalArrowsA(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38782,7 +38800,7 @@ static int
 test_xmlUCSIsSupplementalArrowsB(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38816,7 +38834,7 @@ static int
 test_xmlUCSIsSupplementalMathematicalOperators(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38850,7 +38868,7 @@ static int
 test_xmlUCSIsSupplementaryPrivateUseAreaA(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38884,7 +38902,7 @@ static int
 test_xmlUCSIsSupplementaryPrivateUseAreaB(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38918,7 +38936,7 @@ static int
 test_xmlUCSIsSyriac(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38952,7 +38970,7 @@ static int
 test_xmlUCSIsTagalog(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -38986,7 +39004,7 @@ static int
 test_xmlUCSIsTagbanwa(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39020,7 +39038,7 @@ static int
 test_xmlUCSIsTags(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39054,7 +39072,7 @@ static int
 test_xmlUCSIsTaiLe(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39088,7 +39106,7 @@ static int
 test_xmlUCSIsTaiXuanJingSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39122,7 +39140,7 @@ static int
 test_xmlUCSIsTamil(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39156,7 +39174,7 @@ static int
 test_xmlUCSIsTelugu(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39190,7 +39208,7 @@ static int
 test_xmlUCSIsThaana(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39224,7 +39242,7 @@ static int
 test_xmlUCSIsThai(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39258,7 +39276,7 @@ static int
 test_xmlUCSIsTibetan(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39292,7 +39310,7 @@ static int
 test_xmlUCSIsUgaritic(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39326,7 +39344,7 @@ static int
 test_xmlUCSIsUnifiedCanadianAboriginalSyllabics(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39360,7 +39378,7 @@ static int
 test_xmlUCSIsVariationSelectors(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39394,7 +39412,7 @@ static int
 test_xmlUCSIsVariationSelectorsSupplement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39428,7 +39446,7 @@ static int
 test_xmlUCSIsYiRadicals(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39462,7 +39480,7 @@ static int
 test_xmlUCSIsYiSyllables(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39496,7 +39514,7 @@ static int
 test_xmlUCSIsYijingHexagramSymbols(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_UNICODE_ENABLED
+#if defined(LIBXML_UNICODE_ENABLED)
     int mem_base;
     int ret_val;
     int code; /* UCS code point */
@@ -39706,7 +39724,7 @@ static int
 test_xmlNewTextWriter(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     xmlTextWriterPtr ret_val;
     xmlOutputBufferPtr out; /* an xmlOutputBufferPtr */
@@ -39741,7 +39759,7 @@ static int
 test_xmlNewTextWriterFilename(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     xmlTextWriterPtr ret_val;
     const char * uri; /* the URI of the resource for the output */
@@ -39782,7 +39800,7 @@ static int
 test_xmlNewTextWriterMemory(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     xmlTextWriterPtr ret_val;
     xmlBufferPtr buf; /* xmlBufferPtr */
@@ -39823,7 +39841,7 @@ static int
 test_xmlNewTextWriterPushParser(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     xmlTextWriterPtr ret_val;
     xmlParserCtxtPtr ctxt; /* xmlParserCtxtPtr to hold the new XML document tree */
@@ -39865,7 +39883,7 @@ static int
 test_xmlNewTextWriterTree(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     xmlTextWriterPtr ret_val;
     xmlDocPtr doc; /* xmlDocPtr */
@@ -39913,7 +39931,7 @@ static int
 test_xmlTextWriterEndAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -39947,7 +39965,7 @@ static int
 test_xmlTextWriterEndCDATA(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -39981,7 +39999,7 @@ static int
 test_xmlTextWriterEndComment(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40015,7 +40033,7 @@ static int
 test_xmlTextWriterEndDTD(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40049,7 +40067,7 @@ static int
 test_xmlTextWriterEndDTDAttlist(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40083,7 +40101,7 @@ static int
 test_xmlTextWriterEndDTDElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40117,7 +40135,7 @@ static int
 test_xmlTextWriterEndDTDEntity(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40151,7 +40169,7 @@ static int
 test_xmlTextWriterEndDocument(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40185,7 +40203,7 @@ static int
 test_xmlTextWriterEndElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40219,7 +40237,7 @@ static int
 test_xmlTextWriterEndPI(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40253,7 +40271,7 @@ static int
 test_xmlTextWriterFlush(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40287,7 +40305,7 @@ static int
 test_xmlTextWriterFullEndElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40321,7 +40339,7 @@ static int
 test_xmlTextWriterSetIndent(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40362,7 +40380,7 @@ static int
 test_xmlTextWriterSetIndentString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40403,7 +40421,7 @@ static int
 test_xmlTextWriterStartAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40444,7 +40462,7 @@ static int
 test_xmlTextWriterStartAttributeNS(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40499,7 +40517,7 @@ static int
 test_xmlTextWriterStartCDATA(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40533,7 +40551,7 @@ static int
 test_xmlTextWriterStartComment(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40567,7 +40585,7 @@ static int
 test_xmlTextWriterStartDTD(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40622,7 +40640,7 @@ static int
 test_xmlTextWriterStartDTDAttlist(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40663,7 +40681,7 @@ static int
 test_xmlTextWriterStartDTDElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40704,7 +40722,7 @@ static int
 test_xmlTextWriterStartDTDEntity(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40752,7 +40770,7 @@ static int
 test_xmlTextWriterStartDocument(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40807,7 +40825,7 @@ static int
 test_xmlTextWriterStartElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40848,7 +40866,7 @@ static int
 test_xmlTextWriterStartElementNS(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40903,7 +40921,7 @@ static int
 test_xmlTextWriterStartPI(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40944,7 +40962,7 @@ static int
 test_xmlTextWriterWriteAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -40992,7 +41010,7 @@ static int
 test_xmlTextWriterWriteAttributeNS(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41054,7 +41072,7 @@ static int
 test_xmlTextWriterWriteBase64(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41109,7 +41127,7 @@ static int
 test_xmlTextWriterWriteBinHex(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41164,7 +41182,7 @@ static int
 test_xmlTextWriterWriteCDATA(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41205,7 +41223,7 @@ static int
 test_xmlTextWriterWriteComment(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41246,7 +41264,7 @@ static int
 test_xmlTextWriterWriteDTD(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41308,7 +41326,7 @@ static int
 test_xmlTextWriterWriteDTDAttlist(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41356,7 +41374,7 @@ static int
 test_xmlTextWriterWriteDTDElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41404,7 +41422,7 @@ static int
 test_xmlTextWriterWriteDTDEntity(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41480,7 +41498,7 @@ static int
 test_xmlTextWriterWriteDTDExternalEntity(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41549,7 +41567,7 @@ static int
 test_xmlTextWriterWriteDTDExternalEntityContents(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41604,7 +41622,7 @@ static int
 test_xmlTextWriterWriteDTDInternalEntity(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41659,7 +41677,7 @@ static int
 test_xmlTextWriterWriteDTDNotation(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41714,7 +41732,7 @@ static int
 test_xmlTextWriterWriteElement(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41762,7 +41780,7 @@ static int
 test_xmlTextWriterWriteElementNS(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -41954,7 +41972,7 @@ static int
 test_xmlTextWriterWritePI(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -42002,7 +42020,7 @@ static int
 test_xmlTextWriterWriteRaw(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -42043,7 +42061,7 @@ static int
 test_xmlTextWriterWriteRawLen(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -42091,7 +42109,7 @@ static int
 test_xmlTextWriterWriteString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_WRITER_ENABLED
+#if defined(LIBXML_WRITER_ENABLED)
     int mem_base;
     int ret_val;
     xmlTextWriterPtr writer; /* the xmlTextWriterPtr */
@@ -42349,7 +42367,7 @@ static int
 test_xmlXPathCastBooleanToNumber(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     double ret_val;
     int val; /* a boolean */
@@ -42383,7 +42401,7 @@ static int
 test_xmlXPathCastBooleanToString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     int val; /* a boolean */
@@ -42417,7 +42435,7 @@ static int
 test_xmlXPathCastNodeSetToBoolean(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlNodeSetPtr ns; /* a node-set */
@@ -42451,7 +42469,7 @@ static int
 test_xmlXPathCastNodeSetToNumber(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     double ret_val;
     xmlNodeSetPtr ns; /* a node-set */
@@ -42485,7 +42503,7 @@ static int
 test_xmlXPathCastNodeSetToString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlNodeSetPtr ns; /* a node-set */
@@ -42519,7 +42537,7 @@ static int
 test_xmlXPathCastNodeToNumber(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     double ret_val;
     xmlNodePtr node; /* a node */
@@ -42553,7 +42571,7 @@ static int
 test_xmlXPathCastNodeToString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlNodePtr node; /* a node */
@@ -42587,7 +42605,7 @@ static int
 test_xmlXPathCastNumberToBoolean(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     double val; /* a number */
@@ -42621,7 +42639,7 @@ static int
 test_xmlXPathCastNumberToString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     double val; /* a number */
@@ -42655,7 +42673,7 @@ static int
 test_xmlXPathCastStringToBoolean(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlChar * val; /* a string */
@@ -42689,7 +42707,7 @@ static int
 test_xmlXPathCastStringToNumber(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     double ret_val;
     xmlChar * val; /* a string */
@@ -42723,7 +42741,7 @@ static int
 test_xmlXPathCastToBoolean(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathObjectPtr val; /* an XPath object */
@@ -42757,7 +42775,7 @@ static int
 test_xmlXPathCastToNumber(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     double ret_val;
     xmlXPathObjectPtr val; /* an XPath object */
@@ -42791,7 +42809,7 @@ static int
 test_xmlXPathCastToString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlXPathObjectPtr val; /* an XPath object */
@@ -42825,7 +42843,7 @@ static int
 test_xmlXPathCmpNodes(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlNodePtr node1; /* the first node */
@@ -42896,7 +42914,7 @@ static int
 test_xmlXPathCompiledEval(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathCompExprPtr comp; /* the compiled XPath expression */
@@ -42937,7 +42955,7 @@ static int
 test_xmlXPathConvertBoolean(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathObjectPtr val; /* an XPath object */
@@ -42972,7 +42990,7 @@ static int
 test_xmlXPathConvertNumber(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathObjectPtr val; /* an XPath object */
@@ -43007,7 +43025,7 @@ static int
 test_xmlXPathConvertString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathObjectPtr val; /* an XPath object */
@@ -43052,7 +43070,7 @@ static int
 test_xmlXPathEval(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlChar * str; /* the XPath expression */
@@ -43093,7 +43111,7 @@ static int
 test_xmlXPathEvalExpression(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlChar * str; /* the XPath expression */
@@ -43134,7 +43152,7 @@ static int
 test_xmlXPathEvalPredicate(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathContextPtr ctxt; /* the XPath context */
@@ -43175,7 +43193,7 @@ static int
 test_xmlXPathInit(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
 
         mem_base = xmlMemBlocks();
@@ -43200,7 +43218,7 @@ static int
 test_xmlXPathIsInf(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     double val; /* a double value */
@@ -43234,7 +43252,7 @@ static int
 test_xmlXPathIsNaN(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
     int mem_base;
     int ret_val;
     double val; /* a double value */
@@ -43278,7 +43296,7 @@ static int
 test_xmlXPathNodeSetCreate(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodePtr val; /* an initial xmlNodePtr, or NULL */
@@ -43312,7 +43330,7 @@ static int
 test_xmlXPathObjectCopy(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathObjectPtr val; /* the original object */
@@ -43346,7 +43364,7 @@ static int
 test_xmlXPathOrderDocElems(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     long ret_val;
     xmlDocPtr doc; /* an input document */
@@ -43431,7 +43449,7 @@ static int
 test_valuePop(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathParserContextPtr ctxt; /* an XPath evaluation context */
@@ -43465,7 +43483,7 @@ static int
 test_valuePush(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathParserContextPtr ctxt; /* an XPath evaluation context */
@@ -43506,7 +43524,7 @@ static int
 test_xmlXPathAddValues(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -43538,7 +43556,7 @@ static int
 test_xmlXPathBooleanFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -43577,7 +43595,7 @@ static int
 test_xmlXPathCeilingFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -43616,7 +43634,7 @@ static int
 test_xmlXPathCompareValues(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -43664,7 +43682,7 @@ static int
 test_xmlXPathConcatFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -43703,7 +43721,7 @@ static int
 test_xmlXPathContainsFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -43742,7 +43760,7 @@ static int
 test_xmlXPathCountFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -43781,8 +43799,7 @@ static int
 test_xmlXPathDebugDumpCompExpr(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * for the output */
     int n_output;
@@ -43818,7 +43835,6 @@ test_xmlXPathDebugDumpCompExpr(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -43829,8 +43845,7 @@ static int
 test_xmlXPathDebugDumpObject(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
-#ifdef LIBXML_DEBUG_ENABLED
+#if defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_DEBUG_ENABLED)
     int mem_base;
     FILE * output; /* the FILE * to dump the output */
     int n_output;
@@ -43866,7 +43881,6 @@ test_xmlXPathDebugDumpObject(void) {
     }
     }
     function_tests++;
-#endif
 #endif
 
     return(test_ret);
@@ -43877,7 +43891,7 @@ static int
 test_xmlXPathDifference(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes1; /* a node-set */
@@ -43918,7 +43932,7 @@ static int
 test_xmlXPathDistinct(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes; /* a node-set */
@@ -43952,7 +43966,7 @@ static int
 test_xmlXPathDistinctSorted(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes; /* a node-set, sorted by document order */
@@ -43986,7 +44000,7 @@ static int
 test_xmlXPathDivValues(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44018,7 +44032,7 @@ static int
 test_xmlXPathEqualValues(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -44052,7 +44066,7 @@ static int
 test_xmlXPathErr(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* a XPath parser context */
     int n_ctxt;
@@ -44091,7 +44105,7 @@ static int
 test_xmlXPathEvalExpr(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44123,7 +44137,7 @@ static int
 test_xmlXPathEvaluatePredicateResult(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -44164,7 +44178,7 @@ static int
 test_xmlXPathFalseFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44203,7 +44217,7 @@ static int
 test_xmlXPathFloorFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44262,7 +44276,7 @@ static int
 test_xmlXPathHasSameNodes(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlNodeSetPtr nodes1; /* a node-set */
@@ -44303,7 +44317,7 @@ static int
 test_xmlXPathIdFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44342,7 +44356,7 @@ static int
 test_xmlXPathIntersection(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes1; /* a node-set */
@@ -44383,7 +44397,7 @@ static int
 test_xmlXPathIsNodeType(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlChar * name; /* a name string */
@@ -44417,7 +44431,7 @@ static int
 test_xmlXPathLangFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44456,7 +44470,7 @@ static int
 test_xmlXPathLastFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44495,7 +44509,7 @@ static int
 test_xmlXPathLeading(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes1; /* a node-set */
@@ -44536,7 +44550,7 @@ static int
 test_xmlXPathLeadingSorted(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes1; /* a node-set, sorted by document order */
@@ -44577,7 +44591,7 @@ static int
 test_xmlXPathLocalNameFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44616,7 +44630,7 @@ static int
 test_xmlXPathModValues(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44648,7 +44662,7 @@ static int
 test_xmlXPathMultValues(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44680,7 +44694,7 @@ static int
 test_xmlXPathNamespaceURIFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -44719,7 +44733,7 @@ static int
 test_xmlXPathNewBoolean(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     int val; /* the boolean value */
@@ -44753,7 +44767,7 @@ static int
 test_xmlXPathNewCString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     char * val; /* the char * value */
@@ -44787,7 +44801,7 @@ static int
 test_xmlXPathNewFloat(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     double val; /* the double value */
@@ -44821,7 +44835,7 @@ static int
 test_xmlXPathNewNodeSet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodePtr val; /* the NodePtr value */
@@ -44855,7 +44869,7 @@ static int
 test_xmlXPathNewNodeSetList(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodeSetPtr val; /* an existing NodeSet */
@@ -44899,7 +44913,7 @@ static int
 test_xmlXPathNewString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlChar * val; /* the xmlChar * value */
@@ -44933,7 +44947,7 @@ static int
 test_xmlXPathNextAncestor(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -44974,7 +44988,7 @@ static int
 test_xmlXPathNextAncestorOrSelf(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45015,7 +45029,7 @@ static int
 test_xmlXPathNextAttribute(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45056,7 +45070,7 @@ static int
 test_xmlXPathNextChild(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45097,7 +45111,7 @@ static int
 test_xmlXPathNextDescendant(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45138,7 +45152,7 @@ static int
 test_xmlXPathNextDescendantOrSelf(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45179,7 +45193,7 @@ static int
 test_xmlXPathNextFollowing(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45220,7 +45234,7 @@ static int
 test_xmlXPathNextFollowingSibling(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45261,7 +45275,7 @@ static int
 test_xmlXPathNextNamespace(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45302,7 +45316,7 @@ static int
 test_xmlXPathNextParent(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45343,7 +45357,7 @@ static int
 test_xmlXPathNextPreceding(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45384,7 +45398,7 @@ static int
 test_xmlXPathNextPrecedingSibling(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45425,7 +45439,7 @@ static int
 test_xmlXPathNextSelf(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -45466,7 +45480,7 @@ static int
 test_xmlXPathNodeLeading(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes; /* a node-set */
@@ -45507,7 +45521,7 @@ static int
 test_xmlXPathNodeLeadingSorted(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes; /* a node-set, sorted by document order */
@@ -45548,7 +45562,7 @@ static int
 test_xmlXPathNodeSetAdd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr cur; /* the initial node set */
     int n_cur;
@@ -45587,7 +45601,7 @@ static int
 test_xmlXPathNodeSetAddNs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr cur; /* the initial node set */
     int n_cur;
@@ -45633,7 +45647,7 @@ static int
 test_xmlXPathNodeSetAddUnique(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr cur; /* the initial node set */
     int n_cur;
@@ -45672,7 +45686,7 @@ static int
 test_xmlXPathNodeSetContains(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlNodeSetPtr cur; /* the node-set */
@@ -45713,7 +45727,7 @@ static int
 test_xmlXPathNodeSetDel(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr cur; /* the initial node set */
     int n_cur;
@@ -45752,7 +45766,7 @@ static int
 test_xmlXPathNodeSetMerge(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr val1; /* the first NodeSet or NULL */
@@ -45793,7 +45807,7 @@ static int
 test_xmlXPathNodeSetRemove(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr cur; /* the initial node set */
     int n_cur;
@@ -45832,7 +45846,7 @@ static int
 test_xmlXPathNodeSetSort(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr set; /* the node set */
     int n_set;
@@ -45864,7 +45878,7 @@ static int
 test_xmlXPathNodeTrailing(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes; /* a node-set */
@@ -45905,7 +45919,7 @@ static int
 test_xmlXPathNodeTrailingSorted(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes; /* a node-set, sorted by document order */
@@ -45946,7 +45960,7 @@ static int
 test_xmlXPathNormalizeFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -45985,7 +45999,7 @@ static int
 test_xmlXPathNotEqualValues(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -46019,7 +46033,7 @@ static int
 test_xmlXPathNotFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -46058,7 +46072,7 @@ static int
 test_xmlXPathNsLookup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     const xmlChar * ret_val;
     xmlXPathContextPtr ctxt; /* the XPath context */
@@ -46099,7 +46113,7 @@ static int
 test_xmlXPathNumberFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -46138,7 +46152,7 @@ static int
 test_xmlXPathParseNCName(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -46172,7 +46186,7 @@ static int
 test_xmlXPathParseName(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
@@ -46206,7 +46220,7 @@ static int
 test_xmlXPathPopBoolean(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathParserContextPtr ctxt; /* an XPath parser context */
@@ -46240,7 +46254,7 @@ static int
 test_xmlXPathPopExternal(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     void * ret_val;
     xmlXPathParserContextPtr ctxt; /* an XPath parser context */
@@ -46274,7 +46288,7 @@ static int
 test_xmlXPathPopNodeSet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlXPathParserContextPtr ctxt; /* an XPath parser context */
@@ -46308,7 +46322,7 @@ static int
 test_xmlXPathPopNumber(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     double ret_val;
     xmlXPathParserContextPtr ctxt; /* an XPath parser context */
@@ -46342,7 +46356,7 @@ static int
 test_xmlXPathPopString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlChar * ret_val;
     xmlXPathParserContextPtr ctxt; /* an XPath parser context */
@@ -46376,7 +46390,7 @@ static int
 test_xmlXPathPositionFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -46415,7 +46429,7 @@ static int
 test_xmlXPathRegisterAllFunctions(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathContextPtr ctxt; /* the XPath context */
     int n_ctxt;
@@ -46477,7 +46491,7 @@ static int
 test_xmlXPathRegisterNs(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathContextPtr ctxt; /* the XPath context */
@@ -46525,7 +46539,7 @@ static int
 test_xmlXPathRegisterVariable(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathContextPtr ctxt; /* the XPath context */
@@ -46583,7 +46597,7 @@ static int
 test_xmlXPathRegisterVariableNS(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     int ret_val;
     xmlXPathContextPtr ctxt; /* the XPath context */
@@ -46638,7 +46652,7 @@ static int
 test_xmlXPathRegisteredFuncsCleanup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathContextPtr ctxt; /* the XPath context */
     int n_ctxt;
@@ -46670,7 +46684,7 @@ static int
 test_xmlXPathRegisteredNsCleanup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathContextPtr ctxt; /* the XPath context */
     int n_ctxt;
@@ -46702,7 +46716,7 @@ static int
 test_xmlXPathRegisteredVariablesCleanup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathContextPtr ctxt; /* the XPath context */
     int n_ctxt;
@@ -46734,7 +46748,7 @@ static int
 test_xmlXPathRoot(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -46766,7 +46780,7 @@ static int
 test_xmlXPathRoundFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -46805,7 +46819,7 @@ static int
 test_xmlXPathStartsWithFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -46844,7 +46858,7 @@ static int
 test_xmlXPathStringEvalNumber(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     double ret_val;
     xmlChar * str; /* A string to scan */
@@ -46878,7 +46892,7 @@ static int
 test_xmlXPathStringFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -46917,7 +46931,7 @@ static int
 test_xmlXPathStringLengthFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -46956,7 +46970,7 @@ static int
 test_xmlXPathSubValues(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -46988,7 +47002,7 @@ static int
 test_xmlXPathSubstringAfterFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -47027,7 +47041,7 @@ static int
 test_xmlXPathSubstringBeforeFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -47066,7 +47080,7 @@ static int
 test_xmlXPathSubstringFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -47105,7 +47119,7 @@ static int
 test_xmlXPathSumFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -47144,7 +47158,7 @@ static int
 test_xmlXPathTrailing(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes1; /* a node-set */
@@ -47185,7 +47199,7 @@ static int
 test_xmlXPathTrailingSorted(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlNodeSetPtr ret_val;
     xmlNodeSetPtr nodes1; /* a node-set, sorted by document order */
@@ -47226,7 +47240,7 @@ static int
 test_xmlXPathTranslateFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -47265,7 +47279,7 @@ static int
 test_xmlXPathTrueFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -47304,7 +47318,7 @@ static int
 test_xmlXPathValueFlipSign(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -47336,7 +47350,7 @@ static int
 test_xmlXPathVariableLookup(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathContextPtr ctxt; /* the XPath context */
@@ -47377,7 +47391,7 @@ static int
 test_xmlXPathVariableLookupNS(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathContextPtr ctxt; /* the XPath context */
@@ -47425,7 +47439,7 @@ static int
 test_xmlXPathWrapCString(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     char * val; /* the char * value */
@@ -47459,7 +47473,7 @@ static int
 test_xmlXPathWrapExternal(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     void * val; /* the user data */
@@ -47493,7 +47507,7 @@ static int
 test_xmlXPathWrapNodeSet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodeSetPtr val; /* the NodePtr value */
@@ -47527,7 +47541,7 @@ static int
 test_xmlXPatherror(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPATH_ENABLED
+#if defined(LIBXML_XPATH_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPath Parser context */
     int n_ctxt;
@@ -47703,7 +47717,7 @@ static int
 test_xmlXPtrBuildNodeList(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlNodePtr ret_val;
     xmlXPathObjectPtr obj; /* the XPointer result from the evaluation. */
@@ -47737,7 +47751,7 @@ static int
 test_xmlXPtrEval(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlChar * str; /* the XPointer expression */
@@ -47778,7 +47792,7 @@ static int
 test_xmlXPtrEvalRangePredicate(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPointer Parser context */
     int n_ctxt;
@@ -47820,7 +47834,7 @@ static int
 test_xmlXPtrLocationSetAdd(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlLocationSetPtr cur; /* the initial range set */
     int n_cur;
@@ -47869,7 +47883,7 @@ static int
 test_xmlXPtrLocationSetDel(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlLocationSetPtr cur; /* the initial range set */
     int n_cur;
@@ -47918,7 +47932,7 @@ static int
 test_xmlXPtrLocationSetRemove(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlLocationSetPtr cur; /* the initial range set */
     int n_cur;
@@ -47957,7 +47971,7 @@ static int
 test_xmlXPtrNewCollapsedRange(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodePtr start; /* the starting and ending node */
@@ -48001,7 +48015,7 @@ static int
 test_xmlXPtrNewLocationSetNodeSet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodeSetPtr set; /* a node set */
@@ -48035,7 +48049,7 @@ static int
 test_xmlXPtrNewLocationSetNodes(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodePtr start; /* the start NodePtr value */
@@ -48076,7 +48090,7 @@ static int
 test_xmlXPtrNewRange(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodePtr start; /* the starting node */
@@ -48131,7 +48145,7 @@ static int
 test_xmlXPtrNewRangeNodeObject(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodePtr start; /* the starting node */
@@ -48172,7 +48186,7 @@ static int
 test_xmlXPtrNewRangeNodePoint(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodePtr start; /* the starting node */
@@ -48213,7 +48227,7 @@ static int
 test_xmlXPtrNewRangeNodes(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlNodePtr start; /* the starting node */
@@ -48254,7 +48268,7 @@ static int
 test_xmlXPtrNewRangePointNode(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathObjectPtr start; /* the starting point */
@@ -48295,7 +48309,7 @@ static int
 test_xmlXPtrNewRangePoints(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlXPathObjectPtr start; /* the starting point */
@@ -48336,7 +48350,7 @@ static int
 test_xmlXPtrRangeToFunction(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathParserContextPtr ctxt; /* the XPointer Parser context */
     int n_ctxt;
@@ -48375,7 +48389,7 @@ static int
 test_xmlXPtrWrapLocationSet(void) {
     int test_ret = 0;
 
-#ifdef LIBXML_XPTR_ENABLED
+#if defined(LIBXML_XPTR_ENABLED)
     int mem_base;
     xmlXPathObjectPtr ret_val;
     xmlLocationSetPtr val; /* the LocationSet value */
diff --git a/tree.c b/tree.c
index 805db669..31511c5b 100644
--- a/tree.c
+++ b/tree.c
@@ -1721,7 +1721,8 @@ xmlNodeListGetRawString(xmlDocPtr doc, xmlNodePtr list, int inLine)
 }
 #endif /* LIBXML_TREE_ENABLED */
 
-#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED)
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED)
 /**
  * xmlNewProp:
  * @node:  the holding node
@@ -2963,7 +2964,8 @@ xmlAddNextSibling(xmlNodePtr cur, xmlNodePtr elem) {
     return(elem);
 }
 
-#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED)
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED)
 /**
  * xmlAddPrevSibling:
  * @cur:  the child node
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index 7f35a58f..96efd8a4 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -738,6 +738,7 @@ xmlDeregisterNodeDefault
 xmlDetectCharEncoding
 xmlDictCreate
 xmlDictCreateSub
+xmlDictExists
 xmlDictFree
 xmlDictLookup
 xmlDictOwns
@@ -1601,6 +1602,9 @@ xmlSchemaValidatePredefinedType
 #ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaValidateStream
 #endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaWhiteSpaceReplace
+#endif
 xmlSearchNs
 xmlSearchNsByHref
 xmlSetBufferAllocationScheme
diff --git a/xmlschemas.c b/xmlschemas.c
index 9caee6e9..60e2b319 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -16931,7 +16931,9 @@ xmlSchemaSetValidOptions(xmlSchemaValidCtxtPtr ctxt,
  * xmlSchemaValidCtxtGetOptions:
  * @ctxt:	a schema validation context 
  *
- * Returns the option combination of the validation context.
+ * Get the validation context options.
+ * 
+ * Returns the option combination or -1 on error.
  */
 int
 xmlSchemaValidCtxtGetOptions(xmlSchemaValidCtxtPtr ctxt)
diff --git a/xpath.c b/xpath.c
index fb422c77..2ea8c26a 100644
--- a/xpath.c
+++ b/xpath.c
@@ -64,7 +64,7 @@
  * any use of the macros IS_ASCII_CHARACTER and IS_ASCII_DIGIT)
  */
  
-#if defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_XPATH_ENABLED)
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 /************************************************************************
  * 									*
  * 			Floating point stuff				*