compilation and doc build fixes from Michael Day Daniel
* xmlreader.c include/libxml/xmlreader.h xmlschemas.c: compilation
and doc build fixes from Michael Day
Daniel
diff --git a/ChangeLog b/ChangeLog
index 512bc93..696c6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 2 11:20:00 CET 2006 Daniel Veillard <daniel@veillard.com>
+
+ * xmlreader.c include/libxml/xmlreader.h xmlschemas.c: compilation
+ and doc build fixes from Michael Day
+
Wed Dec 28 22:12:34 CET 2005 Daniel Veillard <daniel@veillard.com>
* xmlregexp.c: bug in xmlRegExecPushString2() pointed out by
diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h
index 1ae8db4..1d12988 100644
--- a/include/libxml/xmlreader.h
+++ b/include/libxml/xmlreader.h
@@ -121,10 +121,15 @@
*/
XMLPUBFUN int XMLCALL
xmlTextReaderRead (xmlTextReaderPtr reader);
+
+#ifdef LIBXML_WRITER_ENABLED
XMLPUBFUN xmlChar * XMLCALL
xmlTextReaderReadInnerXml (xmlTextReaderPtr reader);
+
XMLPUBFUN xmlChar * XMLCALL
xmlTextReaderReadOuterXml (xmlTextReaderPtr reader);
+#endif
+
XMLPUBFUN xmlChar * XMLCALL
xmlTextReaderReadString (xmlTextReaderPtr reader);
XMLPUBFUN int XMLCALL
diff --git a/xmlreader.c b/xmlreader.c
index d3e35d4..0bdf071 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -1626,6 +1626,7 @@
return(xmlTextReaderRead(reader));
}
+#ifdef LIBXML_WRITER_ENABLED
/**
* xmlTextReaderReadInnerXml:
* @reader: the xmlTextReaderPtr used
@@ -1669,7 +1670,9 @@
xmlBufferFree(buff);
return resbuf;
}
+#endif
+#ifdef LIBXML_WRITER_ENABLED
/**
* xmlTextReaderReadOuterXml:
* @reader: the xmlTextReaderPtr used
@@ -1708,6 +1711,7 @@
xmlBufferFree(buff);
return resbuf;
}
+#endif
/**
* xmlTextReaderReadString:
diff --git a/xmlregexp.c b/xmlregexp.c
index 55b0954..de581f0 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -5119,11 +5119,11 @@
/* initialize the parser */
ctxt->end = NULL;
ctxt->start = ctxt->state = xmlRegNewState(ctxt);
- ctxt->start->type = XML_REGEXP_START_STATE;
if (ctxt->start == NULL) {
xmlFreeAutomata(ctxt);
return(NULL);
}
+ ctxt->start->type = XML_REGEXP_START_STATE;
if (xmlRegStatePush(ctxt, ctxt->start) < 0) {
xmlRegFreeState(ctxt->start);
xmlFreeAutomata(ctxt);
diff --git a/xmlschemas.c b/xmlschemas.c
index 9518999..7d936af 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -17843,6 +17843,7 @@
}
#ifdef DEBUG_TYPE
+void
xmlSchemaDebugFixedType(xmlSchemaParserCtxtPtr pctxt,
xmlSchemaTypePtr type)
{