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/malloc.h | |
| 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/malloc.h')
| -rw-r--r-- | libc/stdlib/malloc/malloc.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libc/stdlib/malloc/malloc.h b/libc/stdlib/malloc/malloc.h index 7277cd2cf..2afc3a805 100644 --- a/libc/stdlib/malloc/malloc.h +++ b/libc/stdlib/malloc/malloc.h @@ -70,14 +70,14 @@ struct malloc_mmb struct malloc_mmb *next; }; -/* A list of all malloc_mmb structures describing blocsk that malloc has +/* A list of all malloc_mmb structures describing blocks that malloc has mmapped, ordered by the block address. */ extern struct malloc_mmb *__malloc_mmapped_blocks; /* A heap used for allocating malloc_mmb structures. We could allocate them from the main heap, but that tends to cause heap fragmentation in annoying ways. */ -extern struct heap __malloc_mmb_heap; +extern struct heap_free_area *__malloc_mmb_heap; /* Define MALLOC_MMB_DEBUGGING to cause malloc to emit debugging info about about mmap block allocation/freeing by the `uclinux broken munmap' code @@ -221,4 +221,10 @@ extern void __malloc_debug_printf (int indent, const char *fmt, ...); /* The malloc heap. */ -extern struct heap __malloc_heap; +extern struct heap_free_area *__malloc_heap; +#ifdef __UCLIBC_HAS_THREADS__ +extern malloc_mutex_t __malloc_heap_lock; +#ifdef __UCLIBC_UCLINUX_BROKEN_MUNMAP__ +extern malloc_mutex_t __malloc_mmb_heap_lock; +#endif +#endif |