diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-11-26 08:41:09 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-11-26 08:41:09 +0000 |
| commit | 20cff295659e9bd1bee2c316ee17a53cad693ea2 (patch) | |
| tree | d3681139c0c158406063fc9a1c590e041de14538 /libc/stdlib/malloc/malloc.c | |
| parent | d8ea341e64250c2f4636c559562e8904037eda74 (diff) | |
- revert 24148:24151
Diffstat (limited to 'libc/stdlib/malloc/malloc.c')
| -rw-r--r-- | libc/stdlib/malloc/malloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c index 973f9d569..19877db89 100644 --- a/libc/stdlib/malloc/malloc.c +++ b/libc/stdlib/malloc/malloc.c @@ -28,12 +28,12 @@ HEAP_DECLARE_STATIC_FREE_AREA (initial_fa, 256); struct heap_free_area *__malloc_heap = HEAP_INIT_WITH_FA (initial_fa); #ifdef HEAP_USE_LOCKING -pthread_mutex_t __malloc_heap_lock = PTHREAD_MUTEX_INITIALIZER; +malloc_mutex_t __malloc_heap_lock = PTHREAD_MUTEX_INITIALIZER; #endif #if defined(MALLOC_USE_LOCKING) && defined(MALLOC_USE_SBRK) /* A lock protecting our use of sbrk. */ -pthread_mutex_t __malloc_sbrk_lock; +malloc_mutex_t __malloc_sbrk_lock; #endif /* MALLOC_USE_LOCKING && MALLOC_USE_SBRK */ @@ -48,7 +48,7 @@ struct malloc_mmb *__malloc_mmapped_blocks = 0; HEAP_DECLARE_STATIC_FREE_AREA (initial_mmb_fa, 48); /* enough for 3 mmbs */ struct heap_free_area *__malloc_mmb_heap = HEAP_INIT_WITH_FA (initial_mmb_fa); #ifdef HEAP_USE_LOCKING -pthread_mutex_t __malloc_mmb_heap_lock = PTHREAD_MUTEX_INITIALIZER; +malloc_mutex_t __malloc_mmb_heap_lock = PTHREAD_MUTEX_INITIALIZER; #endif #endif /* __UCLIBC_UCLINUX_BROKEN_MUNMAP__ */ @@ -61,7 +61,7 @@ pthread_mutex_t __malloc_mmb_heap_lock = PTHREAD_MUTEX_INITIALIZER; static void * __malloc_from_heap (size_t size, struct heap_free_area **heap #ifdef HEAP_USE_LOCKING - , pthread_mutex_t *heap_lock + , malloc_mutex_t *heap_lock #endif ) { |