summaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-02-19 17:07:45 +0100
committerFlorian Weimer <fweimer@redhat.com>2016-02-19 17:07:45 +0100
commit59eda029a8a35e5f4e5cd7be0f84c6629e48ec6e (patch)
tree63b915b9258bf371bae30d56f54c5a1eed4b3e61 /malloc
parentca135f824b1dbaf43e4a673de7725db76a51b714 (diff)
downloadglibc-59eda029a8a35e5f4e5cd7be0f84c6629e48ec6e.tar.gz
malloc: Remove NO_THREADS
No functional change. It was not possible to build without threading support before.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/arena.c3
-rw-r--r--malloc/malloc.c2
2 files changed, 0 insertions, 5 deletions
diff --git a/malloc/arena.c b/malloc/arena.c
index 54cf0865ea..cd26cdd02c 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -127,8 +127,6 @@ int __malloc_initialized = -1;
/**************************************************************************/
-#ifndef NO_THREADS
-
/* atfork support. */
static void *(*save_malloc_hook)(size_t __size, const void *);
@@ -327,7 +325,6 @@ ptmalloc_unlock_all2 (void)
# define ptmalloc_unlock_all2 ptmalloc_unlock_all
# endif
-#endif /* !NO_THREADS */
/* Initialization routine. */
#include <string.h>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 1038df4864..b8a43bfb32 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1073,10 +1073,8 @@ static void* realloc_check(void* oldmem, size_t bytes,
const void *caller);
static void* memalign_check(size_t alignment, size_t bytes,
const void *caller);
-#ifndef NO_THREADS
static void* malloc_atfork(size_t sz, const void *caller);
static void free_atfork(void* mem, const void *caller);
-#endif
/* ------------------ MMAP support ------------------ */