From 5ab479b0e4e1ea8dd2be3f9fe4e5c4eac8fa7773 Mon Sep 17 00:00:00 2001
From: "William M. Brack" <wbrack@src.gnome.org>
Date: Thu, 10 Jun 2004 13:00:15 +0000
Subject: fixed problem when configuring using --with-thread-alloc

* configure.in, xmlmemory.c, globals.c: fixed problem when
  configuring using --with-thread-alloc
---
 xmlmemory.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'xmlmemory.c')

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
-- 
cgit v1.2.1