Index: globals.c
===================================================================
RCS file: /cvs/gnome/gnome-xml/globals.c,v
retrieving revision 1.19
diff -c -r1.19 globals.c
*** globals.c	6 Jan 2003 13:11:07 -0000	1.19
--- globals.c	6 Jan 2003 23:31:37 -0000
***************
*** 115,120 ****
--- 115,122 ----
  #undef	xmlPedanticParserDefaultValue
  #undef	xmlSaveNoEmptyTags
  #undef	xmlSubstituteEntitiesDefaultValue
+ #undef	xmlRegisterNodeDefaultValue
+ #undef	xmlDeregisterNodeDefaultValue
  
  #undef	xmlFree
  #undef	xmlMalloc
Index: xmllint.c
===================================================================
RCS file: /cvs/gnome/gnome-xml/xmllint.c,v
retrieving revision 1.67
diff -c -r1.67 xmllint.c
*** xmllint.c	5 Jan 2003 22:37:17 -0000	1.67
--- xmllint.c	6 Jan 2003 23:31:38 -0000
***************
*** 86,95 ****
  #include <libxml/xmlreader.h>
  
  #ifdef LIBXML_DEBUG_ENABLED
- static int debug = 0;
  static int shell = 0;
  static int debugent = 0;
  #endif
  static int copy = 0;
  static int recovery = 0;
  static int noent = 0;
--- 86,95 ----
  #include <libxml/xmlreader.h>
  
  #ifdef LIBXML_DEBUG_ENABLED
  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,1137 ****
--- 1132,1139 ----
      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");
Index: include/libxml/schemasInternals.h
===================================================================
RCS file: /cvs/gnome/gnome-xml/include/libxml/schemasInternals.h,v
retrieving revision 1.7
diff -c -r1.7 schemasInternals.h
*** include/libxml/schemasInternals.h	11 Dec 2002 14:23:48 -0000	1.7
--- include/libxml/schemasInternals.h	6 Jan 2003 23:31:45 -0000
***************
*** 16,21 ****
--- 16,22 ----
  #ifdef LIBXML_SCHEMAS_ENABLED
  
  #include <libxml/xmlregexp.h>
+ #include <libxml/hash.h>
  
  #ifdef __cplusplus
  extern "C" {