commit 438ebbd59af78c436397ae488e42aeca5cad7542
author Daniel Veillard <veillard@src.gnome.org> Mon May 12 12:58:46 2008 +0000
committer Daniel Veillard <veillard@src.gnome.org> Mon May 12 12:58:46 2008 +0000
tree 286979d7e7331bfff71f1f4cdc3f8cf1983e4cb0
parent b6b2ee1a409bcb60be01dd74867a460eeec450e7

fx compilation when configured without the reader should fix #513110

* xmlschemas.c runtest.c testapi.c include/libxml/xmlreader.h
  python/types.c python/libxml_wrap.h python/libxml.c: fx compilation
  when configured without the reader should fix #513110
* doc/*: regenerated
Daniel

svn path=/trunk/; revision=3743

python/libxml.c

diff --git a/python/libxml.c b/python/libxml.c
index 747e44c..95b3cb9 100644
--- a/python/libxml.c
+++ b/python/libxml.c
@@ -23,6 +23,7 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/xmlIO.h>
 #include <libxml/c14n.h>
+#include <libxml/xmlreader.h>
 #include "libxml_wrap.h"
 #include "libxml2-py.h"
 
@@ -1890,6 +1891,7 @@
     return(Py_None);
 }
 
+#ifdef LIBXML_READER_ENABLED
 /************************************************************************
  *									*
  *                      Per xmlTextReader error handler                 *
@@ -2059,6 +2061,7 @@
     Py_INCREF(Py_None);
     return(Py_None);
 }
+#endif
 
 /************************************************************************
  *									*
@@ -3750,9 +3753,11 @@
     {(char *)"xmlParserCtxtSetErrorHandler", libxml_xmlParserCtxtSetErrorHandler, METH_VARARGS, NULL },
     {(char *)"xmlParserCtxtGetErrorHandler", libxml_xmlParserCtxtGetErrorHandler, METH_VARARGS, NULL },
     {(char *)"xmlFreeParserCtxt", libxml_xmlFreeParserCtxt, METH_VARARGS, NULL },
+#ifdef LIBXML_READER_ENABLED
     {(char *)"xmlTextReaderSetErrorHandler", libxml_xmlTextReaderSetErrorHandler, METH_VARARGS, NULL },
     {(char *)"xmlTextReaderGetErrorHandler", libxml_xmlTextReaderGetErrorHandler, METH_VARARGS, NULL },
     {(char *)"xmlFreeTextReader", libxml_xmlFreeTextReader, METH_VARARGS, NULL },
+#endif
     {(char *)"addLocalCatalog", libxml_addLocalCatalog, METH_VARARGS, NULL },
 #ifdef LIBXML_SCHEMAS_ENABLED
     {(char *)"xmlRelaxNGSetValidErrors", libxml_xmlRelaxNGSetValidErrors, METH_VARARGS, NULL},

python/libxml_wrap.h

diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h
index 2758e99..eaa5e96 100644
--- a/python/libxml_wrap.h
+++ b/python/libxml_wrap.h
@@ -99,6 +99,7 @@
 } PyxmlReg_Object;
 #endif /* LIBXML_REGEXP_ENABLED */
 
+#ifdef LIBXML_READER_ENABLED
 #define PyxmlTextReader_Get(v) (((v) == Py_None) ? NULL : \
         (((PyxmlTextReader_Object *)(v))->obj))
 
@@ -114,6 +115,7 @@
     PyObject_HEAD
     xmlTextReaderLocatorPtr obj;
 } PyxmlTextReaderLocator_Object;
+#endif
 
 #define PyURI_Get(v) (((v) == Py_None) ? NULL : \
 	(((PyURI_Object *)(v))->obj))
@@ -229,8 +231,10 @@
 #ifdef LIBXML_REGEXP_ENABLED
 PyObject * libxml_xmlRegexpPtrWrap(xmlRegexpPtr regexp);
 #endif /* LIBXML_REGEXP_ENABLED */
+#ifdef LIBXML_READER_ENABLED
 PyObject * libxml_xmlTextReaderPtrWrap(xmlTextReaderPtr reader);
 PyObject * libxml_xmlTextReaderLocatorPtrWrap(xmlTextReaderLocatorPtr locator);
+#endif
 
 xmlXPathObjectPtr libxml_xmlXPathObjectPtrConvert(PyObject * obj);
 #ifdef LIBXML_SCHEMAS_ENABLED

python/types.c

diff --git a/python/types.c b/python/types.c
index 80e4304..54b50de 100644
--- a/python/types.c
+++ b/python/types.c
@@ -720,6 +720,7 @@
 }
 #endif /* LIBXML_REGEXP_ENABLED */
 
+#ifdef LIBXML_READER_ENABLED
 PyObject *
 libxml_xmlTextReaderPtrWrap(xmlTextReaderPtr reader)
 {
@@ -755,6 +756,7 @@
                                      (char *) "xmlTextReaderLocatorPtr", NULL);
     return (ret);
 }
+#endif /* LIBXML_READER_ENABLED */
 
 #ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *