From 0be050c8b6579abd76f4a405a1964532d4e71bf1 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 16 Oct 2008 21:16:46 +0000 Subject: This should fix malloc with debug and without threads. (Chase N Douglas) This should have been in r23660. Untested. --- libc/stdlib/malloc/realloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libc/stdlib/malloc/realloc.c') diff --git a/libc/stdlib/malloc/realloc.c b/libc/stdlib/malloc/realloc.c index b3b5bae14..f12123aa9 100644 --- a/libc/stdlib/malloc/realloc.c +++ b/libc/stdlib/malloc/realloc.c @@ -59,9 +59,9 @@ realloc (void *mem, size_t new_size) { size_t extra = new_size - size; - __pthread_mutex_lock (&__malloc_heap_lock); + __heap_do_lock (&__malloc_heap_lock); extra = __heap_alloc_at (__malloc_heap, base_mem + size, extra); - __pthread_mutex_unlock (&__malloc_heap_lock); + __heap_do_unlock (&__malloc_heap_lock); if (extra) /* Record the changed size. */ @@ -82,9 +82,9 @@ realloc (void *mem, size_t new_size) else if (new_size + MALLOC_REALLOC_MIN_FREE_SIZE <= size) /* Shrink the block. */ { - __pthread_mutex_lock (&__malloc_heap_lock); + __heap_do_lock (&__malloc_heap_lock); __heap_free (__malloc_heap, base_mem + new_size, size - new_size); - __pthread_mutex_unlock (&__malloc_heap_lock); + __heap_do_unlock (&__malloc_heap_lock); MALLOC_SET_SIZE (base_mem, new_size); } -- cgit v1.2.3