aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-12-10 17:56:59 +0100
committerOndřej Bílka <neleai@seznam.cz>2013-12-10 18:00:14 +0100
commit5782a80f9f8ca86899b30161166f044b0b6b8590 (patch)
treece59040719b2f44dba01dd914edfe2e6ed370beb /malloc/hooks.c
parentAdd GLIBC_2.3 and GLIBC_2.19 in Versions.def (diff)
downloadglibc-5782a80f9f8ca86899b30161166f044b0b6b8590.tar.gz
glibc-5782a80f9f8ca86899b30161166f044b0b6b8590.tar.bz2
glibc-5782a80f9f8ca86899b30161166f044b0b6b8590.zip
Drop PER_THREAD conditionals from malloc.
Diffstat (limited to 'malloc/hooks.c')
-rw-r--r--malloc/hooks.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/malloc/hooks.c b/malloc/hooks.c
index fdacdeff0b..8784adb37a 100644
--- a/malloc/hooks.c
+++ b/malloc/hooks.c
@@ -476,11 +476,9 @@ __malloc_get_state(void)
ms->max_mmapped_mem = mp_.max_mmapped_mem;
ms->using_malloc_checking = using_malloc_checking;
ms->max_fast = get_max_fast();
-#ifdef PER_THREAD
ms->arena_test = mp_.arena_test;
ms->arena_max = mp_.arena_max;
ms->narenas = narenas;
-#endif
(void)mutex_unlock(&main_arena.mutex);
return (void*)ms;
}
@@ -577,11 +575,9 @@ __malloc_set_state(void* msptr)
}
}
if (ms->version >= 4) {
-#ifdef PER_THREAD
mp_.arena_test = ms->arena_test;
mp_.arena_max = ms->arena_max;
narenas = ms->narenas;
-#endif
}
check_malloc_state(&main_arena);