diff options
author | Nicolas Le Cam <niko.lecam@gmail.com> | 2013-06-17 13:01:33 +0200 |
---|---|---|
committer | Daniel Veillard <veillard@redhat.com> | 2014-02-10 10:36:40 +0800 |
commit | 41586ca6674d2fae32b17156494cb6f244ac1170 (patch) | |
tree | c2e1dab53103f691ca1adb768ae38d4c57aa6da0 | |
parent | 52010c639a5da3d40ef73d9aff5c43c3a642661c (diff) | |
download | libxml2-41586ca6674d2fae32b17156494cb6f244ac1170.tar.gz |
Fix compilation with minimum and xinclude.
xinclude needs xmlAddNextSibling().
Compile out use of xmlLocationSetPtr when xptr is disabled.
Include xpath header.
-rw-r--r-- | tree.c | 2 | ||||
-rw-r--r-- | xinclude.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -3039,7 +3039,7 @@ xmlAddNextSibling(xmlNodePtr cur, xmlNodePtr elem) { } #if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \ - defined(LIBXML_SCHEMAS_ENABLED) + defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) /** * xmlAddPrevSibling: * @cur: the child node @@ -17,6 +17,7 @@ #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/uri.h> +#include <libxml/xpath.h> #include <libxml/xpointer.h> #include <libxml/parserInternals.h> #include <libxml/xmlerror.h> @@ -1207,6 +1208,7 @@ xmlXIncludeCopyXPointer(xmlXIncludeCtxtPtr ctxt, xmlDocPtr target, } break; } +#ifdef LIBXML_XPTR_ENABLED case XPATH_LOCATIONSET: { xmlLocationSetPtr set = (xmlLocationSetPtr) obj->user; if (set == NULL) @@ -1226,7 +1228,6 @@ xmlXIncludeCopyXPointer(xmlXIncludeCtxtPtr ctxt, xmlDocPtr target, } break; } -#ifdef LIBXML_XPTR_ENABLED case XPATH_RANGE: return(xmlXIncludeCopyRange(ctxt, target, source, obj)); #endif |