patch from Mark Vakoc that allows compiling with XInclude but without

* xinclude.c: patch from Mark Vakoc that allows compiling
  with XInclude but without XPointer support.
Daniel
This commit is contained in:
Daniel Veillard 2003-09-01 20:59:40 +00:00
parent e8553730ed
commit 10acc2f37a
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,8 @@
Mon Sep 1 22:55:09 CEST 2003 Daniel Veillard <daniel@veillard.com>
* xinclude.c: patch from Mark Vakoc that allows compiling
with XInclude but without XPointer support.
Mon Sep 1 22:31:38 CEST 2003 Daniel Veillard <daniel@veillard.com>
* configure.in xml2-config.in: Applied a patch from Kevin P. Fleming

View File

@ -1116,8 +1116,10 @@ xmlXIncludeCopyXPointer(xmlXIncludeCtxtPtr ctxt, xmlDocPtr target,
}
break;
}
#ifdef LIBXML_XPTR_ENABLED
case XPATH_RANGE:
return(xmlXIncludeCopyRange(ctxt, target, source, obj));
#endif
case XPATH_POINT:
/* points are ignored in XInclude */
break;
@ -1406,7 +1408,9 @@ loaded:
ctxt->incTab[nr]->inc = xmlXIncludeCopyNodeList(ctxt, ctxt->doc,
doc, doc->children);
}
} else {
}
#ifdef LIBXML_XPTR_ENABLED
else {
/*
* Computes the XPointer expression and make a copy used
* as the replacement copy.
@ -1530,6 +1534,7 @@ loaded:
xmlXPathFreeContext(xptrctxt);
xmlFree(fragment);
}
#endif
/*
* Do the xml:base fixup if needed