diff options
author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-11-17 18:00:46 +0000 |
---|---|---|
committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-11-17 18:00:46 +0000 |
commit | 886d6acb51d50addaff443042b399536654e954e (patch) | |
tree | ac7f0371c900217ebc70e4668cc5b023e56c6d45 /libc/stdlib/malloc/realloc.c | |
parent | 312cdbc101048128ba05714f4eca84e7d70af3dd (diff) | |
download | uClibc-alpine-886d6acb51d50addaff443042b399536654e954e.tar.bz2 uClibc-alpine-886d6acb51d50addaff443042b399536654e954e.tar.xz |
Synch with trunk @ 24075.
Step 7: libc/stdlib and malloc
Diffstat (limited to 'libc/stdlib/malloc/realloc.c')
-rw-r--r-- | libc/stdlib/malloc/realloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/stdlib/malloc/realloc.c b/libc/stdlib/malloc/realloc.c index 948326762..a8271995b 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; - __heap_lock (&__malloc_heap); + __heap_lock (&__malloc_heap_lock); extra = __heap_alloc_at (&__malloc_heap, base_mem + size, extra); - __heap_unlock (&__malloc_heap); + __heap_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. */ { - __heap_lock (&__malloc_heap); + __heap_lock (&__malloc_heap_lock); __heap_free (&__malloc_heap, base_mem + new_size, size - new_size); - __heap_unlock (&__malloc_heap); + __heap_unlock (&__malloc_heap_lock); MALLOC_SET_SIZE (base_mem, new_size); } |