fixed --with-threads compile fixed --without-debug compile cleanup add a

* globals.c: fixed --with-threads compile
* xmllint.c: fixed --without-debug compile
* include/libxml/globals.h: cleanup
* include/libxml/schemasInternals.h: add a missing include
Daniel

5 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 474ae3da..08de7476 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan  7 01:17:26 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* globals.c: fixed --with-threads compile
+	* xmllint.c: fixed --without-debug compile
+	* include/libxml/globals.h: cleanup
+	* include/libxml/schemasInternals.h: add a missing include
+
 Mon Jan  6 14:06:07 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in NEWS: preparing 2.5.0 release
diff --git a/globals.c b/globals.c
index b05decd1..2a50a08e 100644
--- a/globals.c
+++ b/globals.c
@@ -115,6 +115,8 @@ xmlStrdupFunc xmlMemStrdup = (xmlStrdupFunc) xmlStrdup;
 #undef	xmlPedanticParserDefaultValue
 #undef	xmlSaveNoEmptyTags
 #undef	xmlSubstituteEntitiesDefaultValue
+#undef	xmlRegisterNodeDefaultValue
+#undef	xmlDeregisterNodeDefaultValue
 
 #undef	xmlFree
 #undef	xmlMalloc
diff --git a/include/libxml/globals.h b/include/libxml/globals.h
index ce98a11f..6f880c08 100644
--- a/include/libxml/globals.h
+++ b/include/libxml/globals.h
@@ -55,8 +55,8 @@ extern "C" {
 #undef xmlRegisterNodeDefaultValue
 #undef xmlDeregisterNodeDefaultValue
 
-typedef void (*xmlRegisterNodeFunc)(xmlNodePtr node);
-typedef void (*xmlDeregisterNodeFunc)(xmlNodePtr node);
+typedef void (*xmlRegisterNodeFunc) (xmlNodePtr node);
+typedef void (*xmlDeregisterNodeFunc) (xmlNodePtr node);
 
 typedef struct _xmlGlobalState xmlGlobalState;
 typedef xmlGlobalState *xmlGlobalStatePtr;
diff --git a/include/libxml/schemasInternals.h b/include/libxml/schemasInternals.h
index 29ad8621..fb1f7eeb 100644
--- a/include/libxml/schemasInternals.h
+++ b/include/libxml/schemasInternals.h
@@ -16,6 +16,7 @@
 #ifdef LIBXML_SCHEMAS_ENABLED
 
 #include <libxml/xmlregexp.h>
+#include <libxml/hash.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/xmllint.c b/xmllint.c
index 917a6ede..19fc3ab3 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -86,10 +86,10 @@
 #include <libxml/xmlreader.h>
 
 #ifdef LIBXML_DEBUG_ENABLED
-static int debug = 0;
 static int shell = 0;
 static int debugent = 0;
 #endif
+static int debug = 0;
 static int copy = 0;
 static int recovery = 0;
 static int noent = 0;
@@ -1132,6 +1132,8 @@ static void usage(const char *name) {
     printf("\t--debug : dump a debug tree of the in-memory document\n");
     printf("\t--shell : run a navigating shell\n");
     printf("\t--debugent : debug the entities defined in the document\n");
+#else
+    printf("\t--debug : dump the nodes content when using --stream\n");
 #endif
     printf("\t--copy : used to test the internal copy implementation\n");
     printf("\t--recover : output what was parsable on broken XML documents\n");