diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-13 13:27:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-13 13:27:32 -0400 |
| commit | f45cde05f934ee95e0002ff7d72f7006ce156a4c (patch) | |
| tree | b8c98e0b3867ccea1f9d7a8976ee76b27d3984e6 /configure.in | |
| parent | 37d19fdfcd4bc82da3276c18b616e7c64ca0c6ab (diff) | |
| download | tor-f45cde05f934ee95e0002ff7d72f7006ce156a4c.tar.gz tor-f45cde05f934ee95e0002ff7d72f7006ce156a4c.zip | |
Remove tor_malloc_roundup().
This function never actually did us any good, and it added a little
complexity. See the changes file for more info.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/configure.in b/configure.in index c107148e79..02041c5a0c 100644 --- a/configure.in +++ b/configure.in @@ -317,18 +317,6 @@ AC_CHECK_FUNCS( vasprintf \ ) -using_custom_malloc=no -if test x$enable_openbsd_malloc = xyes ; then - AC_DEFINE(HAVE_MALLOC_GOOD_SIZE, 1, [Defined if we have the malloc_good_size function]) - 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) AC_CHECK_FUNCS(pthread_create) @@ -703,14 +691,6 @@ AC_CHECK_HEADERS( AC_CHECK_HEADERS(sys/param.h) -TOR_CHECK_PROTOTYPE(malloc_good_size, HAVE_MALLOC_GOOD_SIZE_PROTOTYPE, -[#ifdef HAVE_MALLOC_H -#include <malloc.h> -#endif -#ifdef HAVE_MALLOC_MALLOC_H -#include <malloc/malloc.h> -#endif]) - AC_CHECK_HEADERS(net/if.h, net_if_found=1, net_if_found=0, [#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -1032,6 +1012,17 @@ if test x$tcmalloc = xyes ; then LDFLAGS="-ltcmalloc $LDFLAGS" fi +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) +fi + # By default, we're going to assume we don't have mlockall() # bionic and other platforms have various broken mlockall subsystems. # Some systems don't have a working mlockall, some aren't linkable, |