diff options
author | Premysl Hruby <dfenze@gmail.com> | 2012-04-05 08:25:22 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2012-06-02 15:27:01 +0200 |
commit | ba712cec4acf326f6bb200a1e036a29471f9cf08 (patch) | |
tree | 84beaeed06ba5ce4fb1da678d2b7aafe8ce78628 | |
parent | d44437b182be070d5903cb2a652521230581846d (diff) | |
download | redis-ba712cec4acf326f6bb200a1e036a29471f9cf08.tar.gz |
future-proof version comparison
-rw-r--r-- | src/zmalloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zmalloc.h b/src/zmalloc.h index 6b8fd75b0..6566098f2 100644 --- a/src/zmalloc.h +++ b/src/zmalloc.h @@ -38,7 +38,7 @@ #if defined(USE_TCMALLOC) #define ZMALLOC_LIB ("tcmalloc-" __xstr(TC_VERSION_MAJOR) "." __xstr(TC_VERSION_MINOR)) #include <google/tcmalloc.h> -#if TC_VERSION_MAJOR >= 1 && TC_VERSION_MINOR >= 6 +#if (TC_VERSION_MAJOR == 1 && TC_VERSION_MINOR >= 6) || (TC_VERSION_MAJOR > 1) #define HAVE_MALLOC_SIZE 1 #define zmalloc_size(p) tc_malloc_size(p) #else @@ -48,7 +48,7 @@ #elif defined(USE_JEMALLOC) #define ZMALLOC_LIB ("jemalloc-" __xstr(JEMALLOC_VERSION_MAJOR) "." __xstr(JEMALLOC_VERSION_MINOR) "." __xstr(JEMALLOC_VERSION_BUGFIX)) #include <jemalloc/jemalloc.h> -#if JEMALLOC_VERSION_MAJOR >= 2 && JEMALLOC_VERSION_MINOR >= 1 +#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 |