diff options
| author | Jason Evans <je@fb.com> | 2011-03-14 23:42:26 (GMT) |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2011-03-14 23:42:26 (GMT) |
| commit | ad11ee6a3416e8d234c35670f20687d17545c09f (patch) | |
| tree | 40ca578d2c0e1597d17caf0ca7ea6a552d64e1da /jemalloc/include | |
| parent | e27d134efc8609e3f95e4ec13f605ddcb5eb6ca6 (diff) | |
| parent | 0e4d0d13f9beb8857bb377f41b4fbd327d3a0cbd (diff) | |
| download | jemalloc-2.1.3.zip jemalloc-2.1.3.tar.gz jemalloc-2.1.3.tar.bz2 | |
Merge branch 'dev'2.1.3
Diffstat (limited to 'jemalloc/include')
| -rw-r--r-- | jemalloc/include/jemalloc/internal/jemalloc_internal.h.in | 4 |
1 files 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) { |