From 814b9bda7f17cbedac9969e3526736e85c5f2077 Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Sun, 6 Mar 2011 23:03:33 -0800 Subject: Fix a cpp logic regression. Fix a cpp logic error that was introduced by the recent commit: Fix "thread.{de,}allocatedp" mallctl. --- jemalloc/include/jemalloc/internal/jemalloc_internal.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in b/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in index a27416c..aab2bfb 100644 --- a/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in +++ b/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in @@ -369,7 +369,7 @@ size_t s2u(size_t size); size_t sa2u(size_t size, size_t alignment, size_t *run_size_p); void malloc_write(const char *s); arena_t *choose_arena(void); -# ifdef NO_TLS +# if (defined(JEMALLOC_STATS) && defined(NO_TLS)) thread_allocated_t *thread_allocated_get(void); # endif #endif @@ -533,7 +533,7 @@ choose_arena(void) return (ret); } -#ifdef NO_TLS +#if (defined(JEMALLOC_STATS) && defined(NO_TLS)) JEMALLOC_INLINE thread_allocated_t * thread_allocated_get(void) { -- cgit v0.12