about summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-17 11:29:45 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-17 11:29:45 -0700
commit750c1f2a9aefc7b3329283c1b0c95e1a0bb88f14 (patch)
tree2901a662169f86b152d62b3a67b157e89fd022c1 /malloc
parent2ae1ae5cf441a90171ff483e3f0de6e8a9d611e4 (diff)
downloadglibc-750c1f2a9aefc7b3329283c1b0c95e1a0bb88f14.tar.gz
glibc-750c1f2a9aefc7b3329283c1b0c95e1a0bb88f14.tar.xz
glibc-750c1f2a9aefc7b3329283c1b0c95e1a0bb88f14.zip
Make malloc build for no-threads configurations.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/arena.c12
-rw-r--r--malloc/malloc.c3
2 files changed, 10 insertions, 5 deletions
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 <string.h>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 373e063fc3..0f1796c913 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1075,9 +1075,10 @@ 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);
-/* These routines are never needed in this configuration.  */
+#ifndef NO_THREADS
 static void*   malloc_atfork(size_t sz, const void *caller);
 static void      free_atfork(void* mem, const void *caller);
+#endif
 
 
 /* ------------- Optional versions of memcopy ---------------- */