[libcw-cvs] [CVS] Module src

[Carlo W. <li...@us...>]

CVSROOT    : /cvsroot/libcw
Module     : src
Commit time: 2002-01-09 03:23:09 UTC

Modified files:
     libcwd/configure.in libcwd/debugmalloc.cc
     libcwd/include/libcw/debug_config.ho.in

Log message:

Support _libc_malloc et al too.

---------------------- diff included ----------------------
Index: src/libcwd/configure.in
diff -u src/libcwd/configure.in:1.101 src/libcwd/configure.in:1.102
--- src/libcwd/configure.in:1.101	Sat Feb  2 20:15:11 2002
+++ src/libcwd/configure.in	Fri Feb  8 19:22:59 2002
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.101 $)dnl
+AC_REVISION($Revision: 1.102 $)dnl
 
 dnl General intialization of `autoconf' varaibles.
 dnl Ensure that the directory specified with --srcdir was correct
@@ -220,6 +220,8 @@
 CW_CONFIG_DEBUGMARKER=undef
 AC_SUBST(CW_CONFIG_HAVE___LIBC_MALLOC)
 CW_CONFIG_HAVE___LIBC_MALLOC=undef
+AC_SUBST(CW_CONFIG_HAVE__LIBC_MALLOC)
+CW_CONFIG_HAVE__LIBC_MALLOC=undef
 AC_SUBST(CW_CONFIG_HAVE_DLOPEN)
 CW_CONFIG_HAVE_DLOPEN=undef
 
@@ -431,11 +433,13 @@
 AC_C_BIGENDIAN
 
 dnl Check for library functions.
-AC_CHECK_FUNCS(getgid getegid getgroups __libc_malloc wmemcpy)
+AC_CHECK_FUNCS(getgid getegid getgroups __libc_malloc _libc_malloc wmemcpy)
 
 if test "$ac_cv_func___libc_malloc" = "yes"; then
   CW_CONFIG_HAVE___LIBC_MALLOC=define
-fi
+else if test "$ac_cv_func__libc_malloc" = "yes"; then
+  CW_CONFIG_HAVE__LIBC_MALLOC=define
+fi fi
 
 dnl Check for system services.
 
Index: src/libcwd/debugmalloc.cc
diff -u src/libcwd/debugmalloc.cc:1.81 src/libcwd/debugmalloc.cc:1.82
--- src/libcwd/debugmalloc.cc:1.81	Wed Feb  6 16:38:38 2002
+++ src/libcwd/debugmalloc.cc	Fri Feb  8 19:22:59 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/debugmalloc.cc,v 1.81 2002/02/07 00:38:38 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/debugmalloc.cc,v 1.82 2002/02/09 03:22:59 libcw Exp $
 //
 // Copyright (C) 2000 - 2001, by
 // 
@@ -198,6 +198,12 @@
 #define __libcwd_realloc realloc
 #define __libcwd_free free
 #define dc_malloc dc::malloc
+#ifdef LIBCWD_HAVE__LIBC_MALLOC
+#define __libc_malloc _libc_malloc
+#define __libc_calloc _libc_calloc
+#define __libc_realloc _libc_realloc
+#define __libc_free _libc_free
+#endif
 #else
 #define __libc_malloc malloc
 #define __libc_calloc calloc
Index: src/libcwd/include/libcw/debug_config.ho.in
diff -u src/libcwd/include/libcw/debug_config.ho.in:1.18 src/libcwd/include/libcw/debug_config.ho.in:1.19
--- src/libcwd/include/libcw/debug_config.ho.in:1.18	Tue Feb  5 16:46:08 2002
+++ src/libcwd/include/libcw/debug_config.ho.in	Fri Feb  8 19:22:59 2002
@@ -1,5 +1,5 @@
 // @configure_input@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/debug_config.ho.in,v 1.18 2002/02/06 00:46:08 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/debug_config.ho.in,v 1.19 2002/02/09 03:22:59 libcw Exp $
 //
 // Copyright (C) 2000 - 2001, by
 // 
@@ -267,7 +267,11 @@
 //
 
 #ifdef DEBUGMALLOC
-#@CW_CONFIG_HAVE___LIBC_MALLOC@ DEBUGMALLOCEXTERNALCLINKAGE
+#@CW_CONFIG_HAVE___LIBC_MALLOC@ LIBCWD_HAVE___LIBC_MALLOC
+#@CW_CONFIG_HAVE__LIBC_MALLOC@ LIBCWD_HAVE__LIBC_MALLOC
+#if defined(LIBCWD_HAVE___LIBC_MALLOC) || defined(LIBCWD_HAVE__LIBC_MALLOC)
+#define DEBUGMALLOCEXTERNALCLINKAGE
+#endif
 #endif
 
 #ifdef DEBUGUSEBFD
----------------------- End of diff -----------------------