summaryrefslogtreecommitdiff
path: root/xmlmemory.c
diff options
context:
space:
mode:
authorWilliam M. Brack <wbrack@src.gnome.org>2004-06-10 13:00:15 +0000
committerWilliam M. Brack <wbrack@src.gnome.org>2004-06-10 13:00:15 +0000
commit5ab479b0e4e1ea8dd2be3f9fe4e5c4eac8fa7773 (patch)
tree1e46881976763a588125319958cdf7ba16ca6200 /xmlmemory.c
parent4da70f389d5e1efc8e531c1cb27bd6c7673a2003 (diff)
downloadlibxml2-5ab479b0e4e1ea8dd2be3f9fe4e5c4eac8fa7773.tar.gz
fixed problem when configuring using --with-thread-alloc
* configure.in, xmlmemory.c, globals.c: fixed problem when configuring using --with-thread-alloc
Diffstat (limited to 'xmlmemory.c')
-rw-r--r--xmlmemory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmlmemory.c b/xmlmemory.c
index 927d078c..84458cfc 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 @@ void xmlMallocBreakpoint(void);
* *
************************************************************************/
-
+#if !defined(LIBXML_THREAD_ENABLED) && !defined(LIBXML_THREAD_ALLOC_ENABLED)
#ifdef xmlMalloc
#undef xmlMalloc
#endif
@@ -70,7 +70,7 @@ void xmlMallocBreakpoint(void);
#ifdef xmlMemStrdup
#undef xmlMemStrdup
#endif
-
+#endif
/*
* Each of the blocks allocated begin with a header containing informations