summaryrefslogtreecommitdiff
path: root/src/zmalloc.h
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2012-05-15 15:27:12 +0200
committerantirez <antirez@gmail.com>2012-05-16 11:09:45 +0200
commitad4c0b4117ec15c0061b702f230caf1bc5eb4e06 (patch)
tree76b8e044bab3cec328dc8c8c9210a3088f9d1849 /src/zmalloc.h
parent3c72c94aaeb98b0c4c1a98992539f8839cea1d74 (diff)
downloadredis-ad4c0b4117ec15c0061b702f230caf1bc5eb4e06.tar.gz
Jemalloc updated to 3.0.0.
Full changelog here: http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git;a=blob_plain;f=ChangeLog;hb=master Notable improvements from the point of view of Redis: 1) Bugfixing. 2) Support for Valgrind. 3) Support for OSX Lion, FreeBSD.
Diffstat (limited to 'src/zmalloc.h')
-rw-r--r--src/zmalloc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/zmalloc.h b/src/zmalloc.h
index ff555619e..89f5b6ee0 100644
--- a/src/zmalloc.h
+++ b/src/zmalloc.h
@@ -47,11 +47,10 @@
#elif defined(USE_JEMALLOC)
#define ZMALLOC_LIB ("jemalloc-" __xstr(JEMALLOC_VERSION_MAJOR) "." __xstr(JEMALLOC_VERSION_MINOR) "." __xstr(JEMALLOC_VERSION_BUGFIX))
-#define JEMALLOC_MANGLE
#include <jemalloc/jemalloc.h>
#if (JEMALLOC_VERSION_MAJOR == 2 && JEMALLOC_VERSION_MINOR >= 1) || (JEMALLOC_VERSION_MAJOR > 2)
#define HAVE_MALLOC_SIZE 1
-#define zmalloc_size(p) JEMALLOC_P(malloc_usable_size)(p)
+#define zmalloc_size(p) je_malloc_usable_size(p)
#else
#error "Newer version of jemalloc required"
#endif