c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

applied suggestion from Miloslav Trmac (see Bug 130419) and eliminated

Browse Source 
* 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).
This commit is contained in:
William M. Brack 2004-01-04 01:01:14 +00:00
parent d34b0b8fb8
commit 9202942ba3
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sun Jan 4 08:57:51 HKT 2004 William Brack <wbrack@mmm.com.hk>
* 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).
Fri Jan 2 21:22:18 CET 2004 Daniel Veillard <daniel@veillard.com> Fri Jan 2 21:22:18 CET 2004 Daniel Veillard <daniel@veillard.com>
* error.c: applied patch from Stéphane Bidoul for structured error * error.c: applied patch from Stéphane Bidoul for structured error

10
xml2-config.in
View File

@ -13,6 +13,7 @@ Usage: xml2-config [OPTION]
Known values for OPTION are: Known values for OPTION are:
--prefix=DIR change libxml prefix [default $prefix] --prefix=DIR change libxml prefix [default $prefix]
--exec-prefix=DIR change libxml exec prefix [default $exec_prefix]
--libs print library linking information --libs print library linking information
--libtool-libs print linking information for use with libtool --libtool-libs print linking information for use with libtool
--cflags print pre-processor and compiler flags --cflags print pre-processor and compiler flags
@ -47,6 +48,15 @@ while test $# -gt 0; do
echo $prefix echo $prefix
;; ;;
--exec-prefix=*)
exec_prefix=$optarg
libdir=$exec_prefix/lib
;;
--exec-prefix)
echo $exec_prefix
;;
--version) --version)
echo @VERSION@ echo @VERSION@
exit 0 exit 0

10
xmlmemory.c
View File

@ -769,8 +769,6 @@ xmlMemoryDump(void)
* * * *
****************************************************************/ ****************************************************************/
static int xmlInitMemoryDone = 0;
/** /**
* xmlInitMemory: * xmlInitMemory:
* *
@ -784,9 +782,12 @@ xmlInitMemory(void)
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
char *breakpoint; char *breakpoint;
#endif #endif
/*
This is really not good code (see Bug 130419). Suggestions for
improvement will be welcome!
*/
if (xmlMemInitialized) return(-1);
xmlMemInitialized = 1; xmlMemInitialized = 1;
if (xmlInitMemoryDone) return(-1);
xmlMemMutex = xmlNewMutex(); xmlMemMutex = xmlNewMutex();
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
@ -806,7 +807,6 @@ xmlInitMemory(void)
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"xmlInitMemory() Ok\n"); "xmlInitMemory() Ok\n");
#endif #endif
xmlInitMemoryDone = 1;
return(0); return(0);
} }