commit 5ab479b0e4e1ea8dd2be3f9fe4e5c4eac8fa7773
author William M. Brack <wbrack@src.gnome.org> Thu Jun 10 13:00:15 2004 +0000
committer William M. Brack <wbrack@src.gnome.org> Thu Jun 10 13:00:15 2004 +0000
tree 1e46881976763a588125319958cdf7ba16ca6200
parent 4da70f389d5e1efc8e531c1cb27bd6c7673a2003

fixed problem when configuring using --with-thread-alloc

* configure.in, xmlmemory.c, globals.c: fixed problem when
  configuring using --with-thread-alloc

xmlmemory.c

diff --git a/xmlmemory.c b/xmlmemory.c
index 927d078..84458cf 100644
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -42,8 +42,8 @@
 #endif
 #endif
 
+#include <libxml/globals.h>	/* must come before xmlmemory.h */
 #include <libxml/xmlmemory.h>
-#include <libxml/globals.h>
 #include <libxml/xmlerror.h>
 #include <libxml/threads.h>
 
@@ -60,7 +60,7 @@
  *									*
  ************************************************************************/
 
-
+#if !defined(LIBXML_THREAD_ENABLED) && !defined(LIBXML_THREAD_ALLOC_ENABLED)
 #ifdef xmlMalloc
 #undef xmlMalloc
 #endif
@@ -70,7 +70,7 @@
 #ifdef xmlMemStrdup
 #undef xmlMemStrdup
 #endif
-
+#endif
 
 /*
  * Each of the blocks allocated begin with a header containing informations