From 750c1f2a9aefc7b3329283c1b0c95e1a0bb88f14 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 17 Aug 2012 11:29:45 -0700 Subject: Make malloc build for no-threads configurations. --- malloc/arena.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'malloc/arena.c') diff --git a/malloc/arena.c b/malloc/arena.c index 06bdd77d23..9e5e332020 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -141,6 +141,8 @@ int __malloc_initialized = -1; /**************************************************************************/ +#ifndef NO_THREADS + /* atfork support. */ static __malloc_ptr_t (*save_malloc_hook) (size_t __size, @@ -276,7 +278,7 @@ ptmalloc_unlock_all (void) (void)mutex_unlock(&list_lock); } -#ifdef __linux__ +# ifdef __linux__ /* In NPTL, unlocking a mutex in the child process after a fork() is currently unsafe, whereas re-initializing it is safe and @@ -311,11 +313,13 @@ ptmalloc_unlock_all2 (void) atfork_recursive_cntr = 0; } -#else +# else -#define ptmalloc_unlock_all2 ptmalloc_unlock_all +# define ptmalloc_unlock_all2 ptmalloc_unlock_all -#endif +# endif + +#endif /* !NO_THREADS */ /* Initialization routine. */ #include -- cgit 1.4.1