r18848@catbus: nickm | 2008-03-16 22:26:44 -0400

Partial backport of r14010: When using a nonstandard malloc, do not check the regular libc for malloc_good_size, malloc_usable_size, or mallinfo.


svn:r14058
This commit is contained in:
Nick Mathewson 2008-03-17 02:48:17 +00:00
parent 1126cf41f2
commit 8b36025a21
2 changed files with 14 additions and 1 deletions

View File

@ -25,6 +25,8 @@ Changes in version 0.2.0.22-rc - 2008-03-??
Fixes bug 625. Bugfix on 0.2.0.x.
- Logging functions now check that the passed severity is sane.
- Use proper log levels in the testsuite call of get_interface_address6().
- When using a nonstandard malloc, do not use the platform values for
HAVE_MALLOC_GOOD_SIZE or HAVE_MALLOC_USABLE_SIZE.
Changes in version 0.2.0.21-rc - 2008-03-02

View File

@ -183,7 +183,18 @@ dnl -------------------------------------------------------------------
dnl Check for functions before libevent, since libevent-1.2 apparently
dnl exports strlcpy without defining it in a header.
AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull ftello getaddrinfo localtime_r gmtime_r memmem strtok_r inet_pton inet_ntop mallinfo malloc_good_size malloc_usable_size)
AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull ftello getaddrinfo localtime_r gmtime_r memmem strtok_r inet_pton inet_ntop)
using_custom_malloc=no
if test x$enable_openbsd_malloc = xyes ; then
using_custom_malloc=yes
fi
if test x$tcmalloc = xyes ; then
using_custom_malloc=yes
fi
if test $using_custom_malloc = no ; then
AC_CHECK_FUNCS(mallinfo malloc_good_size malloc_usable_size)
fi
if test "$enable_threads" = "yes"; then
AC_CHECK_HEADERS(pthread.h)