diff options
| author | John Birrell <jb@FreeBSD.org> | 1997-06-04 12:55:49 +0000 |
|---|---|---|
| committer | John Birrell <jb@FreeBSD.org> | 1997-06-04 12:55:49 +0000 |
| commit | 1a3a296d211062e9325815943280ddd8873492f7 (patch) | |
| tree | 5a88c4a9179c6ec32825055f69f3bcce269f0d28 /lib/libc/stdlib/malloc.c | |
| parent | 2bb6086363fab95eb937eda0a1b363353f8aeb8c (diff) | |
Notes
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index f8f285c090cb..0327517d9284 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: malloc.c,v 1.22 1997/03/18 07:54:24 phk Exp $ + * $Id: malloc.c,v 1.23 1997/05/30 20:39:32 phk Exp $ * */ @@ -72,14 +72,14 @@ #ifdef _THREAD_SAFE #include <pthread.h> -static pthread_mutex_t malloc_lock; +#include "pthread_private.h" +static struct pthread_mutex _malloc_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t malloc_lock = &_malloc_lock; #define THREAD_LOCK() pthread_mutex_lock(&malloc_lock) #define THREAD_UNLOCK() pthread_mutex_unlock(&malloc_lock) -#define THREAD_LOCK_INIT() pthread_mutex_init(&malloc_lock, 0); #else #define THREAD_LOCK() #define THREAD_UNLOCK() -#define THREAD_LOCK_INIT() #endif /* @@ -454,8 +454,6 @@ malloc_init () char *p, b[64]; int i, j; - THREAD_LOCK_INIT(); - INIT_MMAP(); #ifdef EXTRA_SANITY |