[PATCH] Fix glibc hooks when using both --with-jemalloc-prefix and --with-mangling

[Mike Hommey]

From: Mike Hommey <mh at glandium.org>

---
 src/jemalloc.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/jemalloc.c b/src/jemalloc.c
index 3e168fd..54c8334 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -1181,7 +1181,15 @@ je_valloc(size_t size)
 }
 #endif
 
-#if (!defined(JEMALLOC_PREFIX) && defined(__GLIBC__) && !defined(__UCLIBC__))
+/*
+ * is_malloc(je_malloc) is some macro magic to detect if jemalloc_defs.h has
+ * #define je_malloc malloc
+ */
+#define malloc_is_malloc 1
+#define is_malloc_(a) malloc_is_ ## a
+#define is_malloc(a) is_malloc_(a)
+
+#if ((is_malloc(je_malloc) == 1) && defined(__GLIBC__) && !defined(__UCLIBC__))
 /*
  * glibc provides the RTLD_DEEPBIND flag for dlopen which can make it possible
  * to inconsistently reference libc's malloc(3)-compatible functions
-- 
1.7.9.1