diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-03-17 02:48:17 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-03-17 02:48:17 +0000 |
| commit | 8b36025a21f210648b2e51c67a982c676d244ba1 (patch) | |
| tree | 835046aa56c401c1439d74cd9d9e3c0f30397f58 | |
| parent | 1126cf41f262ccc9aa74c8ce780432313e83cdc1 (diff) | |
| download | tor-8b36025a21f210648b2e51c67a982c676d244ba1.tar.gz tor-8b36025a21f210648b2e51c67a982c676d244ba1.zip | |
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
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.in | 13 |
2 files changed, 14 insertions, 1 deletions
@@ -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 diff --git a/configure.in b/configure.in index 4a15717891..da377776d5 100644 --- a/configure.in +++ b/configure.in @@ -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) |