merge conflict resolved

[redis.git] / src / zmalloc.c

diff --git a/src/zmalloc.c b/src/zmalloc.c
index 544155e78792413554c8d206500450ef0dba820c..8cfb18d940f23b105439bd090d61fa87e4be3987 100644 (file)
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
@@ -32,13 +32,24 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>

-

 #include "config.h"
 
 #include "config.h"
 

+#ifdef HAVE_MALLOC_SIZE
+#define PREFIX_SIZE (0)
+#else

 #if defined(__sun)
 #if defined(__sun)

-#define PREFIX_SIZE sizeof(long long)
+#define PREFIX_SIZE (sizeof(long long))

 #else
 #else

-#define PREFIX_SIZE sizeof(size_t)
+#define PREFIX_SIZE (sizeof(size_t))
+#endif
+#endif
+
+/* Explicitly override malloc/free etc when using tcmalloc. */
+#if defined(USE_TCMALLOC)
+#define malloc(size) tc_malloc(size)
+#define calloc(count,size) tc_calloc(count,size)
+#define realloc(ptr,size) tc_realloc(ptr,size)
+#define free(ptr) tc_free(ptr)

 #endif
 
 #define increment_used_memory(__n) do { \
 #endif
 
 #define increment_used_memory(__n) do { \