From d0271473abc7ca82a22e9a953ec525a6f4b504d5 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Mon, 2 Jan 2006 10:22:02 +0000
Subject: [PATCH] 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
---
 ChangeLog                  | 5 +++++
 include/libxml/xmlreader.h | 5 +++++
 xmlreader.c                | 4 ++++
 xmlregexp.c                | 2 +-
 xmlschemas.c               | 1 +
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 512bc93d..696c6c33 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 1ae8db4d..1d12988f 100644
--- a/include/libxml/xmlreader.h
+++ b/include/libxml/xmlreader.h
@@ -121,10 +121,15 @@ XMLPUBFUN void XMLCALL
  */
 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 d3e35d45..0bdf0719 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -1626,6 +1626,7 @@ xmlTextReaderNext(xmlTextReaderPtr reader) {
     return(xmlTextReaderRead(reader));
 }
 
+#ifdef LIBXML_WRITER_ENABLED
 /**
  * xmlTextReaderReadInnerXml:
  * @reader:  the xmlTextReaderPtr used
@@ -1669,7 +1670,9 @@ xmlTextReaderReadInnerXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED)
     xmlBufferFree(buff);
     return resbuf;
 }
+#endif
 
+#ifdef LIBXML_WRITER_ENABLED
 /**
  * xmlTextReaderReadOuterXml:
  * @reader:  the xmlTextReaderPtr used
@@ -1708,6 +1711,7 @@ xmlTextReaderReadOuterXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED)
     xmlBufferFree(buff);
     return resbuf;
 }
+#endif
 
 /**
  * xmlTextReaderReadString:
diff --git a/xmlregexp.c b/xmlregexp.c
index 55b09544..de581f0b 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -5119,11 +5119,11 @@ xmlNewAutomata(void) {
     /* 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 95189991..7d936afd 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -17843,6 +17843,7 @@ xmlSchemaFixupSimpleTypeStageOne(xmlSchemaParserCtxtPtr pctxt,
 }
 
 #ifdef DEBUG_TYPE
+void
 xmlSchemaDebugFixedType(xmlSchemaParserCtxtPtr pctxt,
 		       xmlSchemaTypePtr type)
 {