applied suggestion from Miloslav Trmac (see Bug 130419) and eliminated
* xmlmemory.c: applied suggestion from Miloslav Trmac (see
Bug 130419) and eliminated xmlInitMemoryDone. More
improvement needed.
* xml2-config.in: added an additional flag (--exec-prefix) to
allow library directory to be different from include directory
(Bug 129558).
diff --git a/xmlmemory.c b/xmlmemory.c
index 55831d7..ccd8f55 100644
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -769,8 +769,6 @@
* *
****************************************************************/
-static int xmlInitMemoryDone = 0;
-
/**
* xmlInitMemory:
*
@@ -784,9 +782,12 @@
#ifdef HAVE_STDLIB_H
char *breakpoint;
#endif
-
+ /*
+ This is really not good code (see Bug 130419). Suggestions for
+ improvement will be welcome!
+ */
+ if (xmlMemInitialized) return(-1);
xmlMemInitialized = 1;
- if (xmlInitMemoryDone) return(-1);
xmlMemMutex = xmlNewMutex();
#ifdef HAVE_STDLIB_H
@@ -806,7 +807,6 @@
xmlGenericError(xmlGenericErrorContext,
"xmlInitMemory() Ok\n");
#endif
- xmlInitMemoryDone = 1;
return(0);
}