diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-09-02 13:34:01 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-09-02 13:34:01 +0400 |
| commit | fa06cf6edf86aa1839d4f43bfd3bd9a3a36b5223 (patch) | |
| tree | 705466443ec58fffa74a3499a3bcc56be1cdee9d /python/libxml2-py.h | |
| parent | 08f466c86ef859f2f3ab1f65677536cbccd85960 (diff) | |
| parent | 3a8c2d58eab0410fe5e79a112614aa9be061dc46 (diff) | |
| download | libxml2-fa06cf6edf86aa1839d4f43bfd3bd9a3a36b5223.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/debian-xml-sgml/libxml2
Conflicts:
debian/changelog
debian/control
debian/rules
Diffstat (limited to 'python/libxml2-py.h')
| -rw-r--r-- | python/libxml2-py.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/python/libxml2-py.h b/python/libxml2-py.h index acc0e05..ab57087 100644 --- a/python/libxml2-py.h +++ b/python/libxml2-py.h @@ -650,7 +650,6 @@ PyObject * libxml_xmlParserSetValidate(PyObject *self, PyObject *args); PyObject * libxml_xmlPathToURI(PyObject *self, PyObject *args); PyObject * libxml_xmlPedanticParserDefault(PyObject *self, PyObject *args); PyObject * libxml_xmlPopInput(PyObject *self, PyObject *args); -PyObject * libxml_xmlPopInputCallbacks(PyObject *self, PyObject *args); #if defined(LIBXML_TREE_ENABLED) PyObject * libxml_xmlPreviousElementSibling(PyObject *self, PyObject *args); #endif /* defined(LIBXML_TREE_ENABLED) */ @@ -1919,6 +1918,9 @@ PyObject * libxml_xmlXPathNextPrecedingSibling(PyObject *self, PyObject *args); PyObject * libxml_xmlXPathNextSelf(PyObject *self, PyObject *args); #endif /* defined(LIBXML_XPATH_ENABLED) */ #if defined(LIBXML_XPATH_ENABLED) +PyObject * libxml_xmlXPathNodeEval(PyObject *self, PyObject *args); +#endif /* defined(LIBXML_XPATH_ENABLED) */ +#if defined(LIBXML_XPATH_ENABLED) PyObject * libxml_xmlXPathNodeSetFreeNs(PyObject *self, PyObject *args); #endif /* defined(LIBXML_XPATH_ENABLED) */ #if defined(LIBXML_XPATH_ENABLED) @@ -1967,6 +1969,9 @@ PyObject * libxml_xmlXPathRegisterAllFunctions(PyObject *self, PyObject *args); PyObject * libxml_xmlXPathRegisterNs(PyObject *self, PyObject *args); #endif /* defined(LIBXML_XPATH_ENABLED) */ #if defined(LIBXML_XPATH_ENABLED) +PyObject * libxml_xmlXPathRegisterVariable(PyObject *self, PyObject *args); +#endif +#if defined(LIBXML_XPATH_ENABLED) PyObject * libxml_xmlXPathRegisteredFuncsCleanup(PyObject *self, PyObject *args); #endif /* defined(LIBXML_XPATH_ENABLED) */ #if defined(LIBXML_XPATH_ENABLED) |