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-simple | |
| 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-simple')
| -rw-r--r-- | libc/stdlib/malloc-simple/alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c index 13d4166a7..45faf62db 100644 --- a/libc/stdlib/malloc-simple/alloc.c +++ b/libc/stdlib/malloc-simple/alloc.c @@ -15,6 +15,7 @@ #include <string.h> #include <errno.h> #include <sys/mman.h> +#include <malloc.h> /* Experimentally off - libc_hidden_proto(memcpy) */ /*libc_hidden_proto(memset)*/ @@ -116,7 +117,7 @@ void free(void *ptr) #ifdef L_memalign #include <bits/uClibc_mutex.h> -__UCLIBC_MUTEX_STATIC(__malloc_lock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP); +__UCLIBC_MUTEX_INIT(__malloc_lock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP); #define __MALLOC_LOCK __UCLIBC_MUTEX_LOCK(__malloc_lock) #define __MALLOC_UNLOCK __UCLIBC_MUTEX_UNLOCK(__malloc_lock) |