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-export.c | |
| 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-export.c')
| -rw-r--r-- | python/libxml2-export.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/python/libxml2-export.c b/python/libxml2-export.c index 19ef337..f7d96e1 100644 --- a/python/libxml2-export.c +++ b/python/libxml2-export.c @@ -650,7 +650,6 @@ { (char *)"xmlPathToURI", libxml_xmlPathToURI, METH_VARARGS, NULL }, { (char *)"xmlPedanticParserDefault", libxml_xmlPedanticParserDefault, METH_VARARGS, NULL }, { (char *)"xmlPopInput", libxml_xmlPopInput, METH_VARARGS, NULL }, - { (char *)"xmlPopInputCallbacks", libxml_xmlPopInputCallbacks, METH_VARARGS, NULL }, #if defined(LIBXML_TREE_ENABLED) { (char *)"xmlPreviousElementSibling", libxml_xmlPreviousElementSibling, METH_VARARGS, NULL }, #endif /* defined(LIBXML_TREE_ENABLED) */ @@ -1919,6 +1918,9 @@ { (char *)"xmlXPathNextSelf", libxml_xmlXPathNextSelf, METH_VARARGS, NULL }, #endif /* defined(LIBXML_XPATH_ENABLED) */ #if defined(LIBXML_XPATH_ENABLED) + { (char *)"xmlXPathNodeEval", libxml_xmlXPathNodeEval, METH_VARARGS, NULL }, +#endif /* defined(LIBXML_XPATH_ENABLED) */ +#if defined(LIBXML_XPATH_ENABLED) { (char *)"xmlXPathNodeSetFreeNs", libxml_xmlXPathNodeSetFreeNs, METH_VARARGS, NULL }, #endif /* defined(LIBXML_XPATH_ENABLED) */ #if defined(LIBXML_XPATH_ENABLED) @@ -1967,6 +1969,9 @@ { (char *)"xmlXPathRegisterNs", libxml_xmlXPathRegisterNs, METH_VARARGS, NULL }, #endif /* defined(LIBXML_XPATH_ENABLED) */ #if defined(LIBXML_XPATH_ENABLED) + { (char *)"xmlXPathRegisterVariable", libxml_xmlXPathRegisterVariable, METH_VARARGS, NULL }, +#endif +#if defined(LIBXML_XPATH_ENABLED) { (char *)"xmlXPathRegisteredFuncsCleanup", libxml_xmlXPathRegisteredFuncsCleanup, METH_VARARGS, NULL }, #endif /* defined(LIBXML_XPATH_ENABLED) */ #if defined(LIBXML_XPATH_ENABLED) |