Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
ba712cec
Commit
ba712cec
authored
Apr 05, 2012
by
Premysl Hruby
Committed by
antirez
Jun 02, 2012
Browse files
future-proof version comparison
parent
d44437b1
Changes
1
Show whitespace changes
Inline
Side-by-side
src/zmalloc.h
View file @
ba712cec
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
#if defined(USE_TCMALLOC)
#if defined(USE_TCMALLOC)
#define ZMALLOC_LIB ("tcmalloc-" __xstr(TC_VERSION_MAJOR) "." __xstr(TC_VERSION_MINOR))
#define ZMALLOC_LIB ("tcmalloc-" __xstr(TC_VERSION_MAJOR) "." __xstr(TC_VERSION_MINOR))
#include <google/tcmalloc.h>
#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 HAVE_MALLOC_SIZE 1
#define zmalloc_size(p) tc_malloc_size(p)
#define zmalloc_size(p) tc_malloc_size(p)
#else
#else
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
#elif defined(USE_JEMALLOC)
#elif defined(USE_JEMALLOC)
#define ZMALLOC_LIB ("jemalloc-" __xstr(JEMALLOC_VERSION_MAJOR) "." __xstr(JEMALLOC_VERSION_MINOR) "." __xstr(JEMALLOC_VERSION_BUGFIX))
#define ZMALLOC_LIB ("jemalloc-" __xstr(JEMALLOC_VERSION_MAJOR) "." __xstr(JEMALLOC_VERSION_MINOR) "." __xstr(JEMALLOC_VERSION_BUGFIX))
#include <jemalloc/jemalloc.h>
#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 HAVE_MALLOC_SIZE 1
#define zmalloc_size(p) je_malloc_usable_size(p)
#define zmalloc_size(p) je_malloc_usable_size(p)
#else
#else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment