From 594b10cbcb2398a17ac07cca24cd1a6907278965 Mon Sep 17 00:00:00 2001 From: c9s Date: Wed, 21 May 2014 23:26:01 +0800 Subject: [PATCH] travis-ci is using jemalloc 2.1+ --- include/zmalloc.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/zmalloc.h b/include/zmalloc.h index eaeb765..383f377 100644 --- a/include/zmalloc.h +++ b/include/zmalloc.h @@ -48,8 +48,7 @@ #elif defined(USE_JEMALLOC) #define ZMALLOC_LIB ("jemalloc-" __xstr(JEMALLOC_VERSION_MAJOR) "." __xstr(JEMALLOC_VERSION_MINOR) "." __xstr(JEMALLOC_VERSION_BUGFIX)) #include -// #if (JEMALLOC_VERSION_MAJOR == 2 && JEMALLOC_VERSION_MINOR >= 1) || (JEMALLOC_VERSION_MAJOR > 2) -#if JEMALLOC_VERSION_MAJOR > 2 +#if (JEMALLOC_VERSION_MAJOR == 2 && JEMALLOC_VERSION_MINOR >= 1) || (JEMALLOC_VERSION_MAJOR > 2) #define HAVE_MALLOC_SIZE 1 #define zmalloc_size(p) je_malloc_usable_size(p) #else