summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Le Cam <niko.lecam@gmail.com>2013-06-17 13:01:33 +0200
committerDaniel Veillard <veillard@redhat.com>2014-02-10 10:36:40 +0800
commit41586ca6674d2fae32b17156494cb6f244ac1170 (patch)
treec2e1dab53103f691ca1adb768ae38d4c57aa6da0
parent52010c639a5da3d40ef73d9aff5c43c3a642661c (diff)
downloadlibxml2-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.c2
-rw-r--r--xinclude.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/tree.c b/tree.c
index bcf9f4b3..1b3876f4 100644
--- a/tree.c
+++ b/tree.c
@@ -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
diff --git a/xinclude.c b/xinclude.c
index 107ac035..ff3dafbb 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -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