From d94ac406ba8061f3ac3cdda2bb372367d736a3fc Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Sat, 23 Oct 2010 10:18:48 +0200 Subject: Exclusively use either tcmalloc or OSX's native malloc_size() --- src/config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/config.h') diff --git a/src/config.h b/src/config.h index 62f808f5d..40f22fa51 100644 --- a/src/config.h +++ b/src/config.h @@ -5,17 +5,17 @@ #include #endif -/* use tcmalloc's malloc_size() when available */ +/* Use tcmalloc's malloc_size() when available. + * When tcmalloc is used, native OSX malloc_size() may never be used because + * this expects a different allocation scheme. Therefore, *exclusively* use + * either tcmalloc or OSX's malloc_size()! */ #if defined(USE_TCMALLOC) #include #if TC_VERSION_MAJOR >= 1 && TC_VERSION_MINOR >= 6 #define HAVE_MALLOC_SIZE 1 #define redis_malloc_size(p) tc_malloc_size(p) #endif -#endif - -/* fallback to native malloc_size() for osx */ -#if defined(__APPLE__) && !defined(HAVE_MALLOC_SIZE) +#elif defined(__APPLE__) #include #define HAVE_MALLOC_SIZE 1 #define redis_malloc_size(p) malloc_size(p) -- cgit v1.2.1