diff options
| author | Stefan Behnel <stefan_ml@behnel.de> | 2014-03-15 10:23:54 +0100 |
|---|---|---|
| committer | Stefan Behnel <stefan_ml@behnel.de> | 2014-03-15 10:23:54 +0100 |
| commit | 34a18baaa6cda233cd2aac12d69a313e3d32971c (patch) | |
| tree | 15a491bb8a89caba8f001723c1e8ba3296179da2 /src/lxml/includes | |
| parent | 2e6a1b6f25701b83a776131f4e8d0820531cfa00 (diff) | |
| download | python-lxml-34a18baaa6cda233cd2aac12d69a313e3d32971c.tar.gz | |
use safer way to pass parser context into XInclude engine in libxml2 2.7.4 and later
--HG--
extra : amend_source : 5e5f9f4de27a119ab64f722fd7a23ceeae98de46
Diffstat (limited to 'src/lxml/includes')
| -rw-r--r-- | src/lxml/includes/etree_defs.h | 1 | ||||
| -rw-r--r-- | src/lxml/includes/xinclude.pxd | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/lxml/includes/etree_defs.h b/src/lxml/includes/etree_defs.h index 00483d46..33cd948d 100644 --- a/src/lxml/includes/etree_defs.h +++ b/src/lxml/includes/etree_defs.h @@ -122,6 +122,7 @@ #if LIBXML_VERSION < 20704 /* FIXME: hack to make new error reporting compile in old libxml2 versions */ # define xmlStructuredErrorContext NULL +# define xmlXIncludeProcessTreeFlagsData(n,o,d) xmlXIncludeProcessTreeFlags(n,o) #endif /* added to xmlsave API in libxml2 2.6.23 */ diff --git a/src/lxml/includes/xinclude.pxd b/src/lxml/includes/xinclude.pxd index fe622b2d..4232d3e4 100644 --- a/src/lxml/includes/xinclude.pxd +++ b/src/lxml/includes/xinclude.pxd @@ -9,6 +9,10 @@ cdef extern from "libxml/xinclude.h": cdef int xmlXIncludeProcessTree(xmlNode* doc) nogil cdef int xmlXIncludeProcessTreeFlags(xmlNode* doc, int parser_opts) nogil + # libxml2 >= 2.7.4 + cdef int xmlXIncludeProcessTreeFlagsData( + xmlNode* doc, int parser_opts, void* data) nogil + cdef xmlXIncludeCtxt* xmlXIncludeNewContext(xmlDoc* doc) nogil cdef int xmlXIncludeProcessNode(xmlXIncludeCtxt* ctxt, xmlNode* node) nogil cdef int xmlXIncludeSetFlags(xmlXIncludeCtxt* ctxt, int flags) nogil |