From 868d059a1405f814048041a0329021122542520c Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 5 Feb 2013 19:11:36 +0100 Subject: mman: rename MAP_UNINITIALIZE to MAP_UNINITIALIZED The name was changed to include a trailing 'D' when it went into the kernel. Signed-off-by: Bernhard Reutner-Fischer --- libc/stdlib/malloc-simple/alloc.c | 4 ++-- libc/stdlib/malloc-standard/malloc.h | 6 +++--- libc/stdlib/malloc/malloc.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libc/stdlib') diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c index 11d4dcf23..6028dcb30 100644 --- a/libc/stdlib/malloc-simple/alloc.c +++ b/libc/stdlib/malloc-simple/alloc.c @@ -37,7 +37,7 @@ void *malloc(size_t size) #ifdef __ARCH_USE_MMU__ # define MMAP_FLAGS MAP_PRIVATE | MAP_ANONYMOUS #else -# define MMAP_FLAGS MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZE +# define MMAP_FLAGS MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZED #endif result = mmap((void *) 0, size + sizeof(size_t), PROT_READ | PROT_WRITE, @@ -64,7 +64,7 @@ void * calloc(size_t nmemb, size_t lsize) result = malloc(size); #ifndef __ARCH_USE_MMU__ - /* mmap'd with MAP_UNINITIALIZE, we have to blank memory ourselves */ + /* mmap'd with MAP_UNINITIALIZED, we have to blank memory ourselves */ if (result != NULL) { memset(result, 0, size); } diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h index 9b411bdb8..d945627c6 100644 --- a/libc/stdlib/malloc-standard/malloc.h +++ b/libc/stdlib/malloc-standard/malloc.h @@ -353,13 +353,13 @@ __UCLIBC_MUTEX_EXTERN(__malloc_lock) #endif #ifdef __ARCH_USE_MMU__ -# define _MAP_UNINITIALIZE 0 +# define _MAP_UNINITIALIZED 0 #else -# define _MAP_UNINITIALIZE MAP_UNINITIALIZE +# define _MAP_UNINITIALIZED MAP_UNINITIALIZED #endif #define MMAP(addr, size, prot) \ - (mmap((addr), (size), (prot), MAP_PRIVATE|MAP_ANONYMOUS|_MAP_UNINITIALIZE, 0, 0)) + (mmap((addr), (size), (prot), MAP_PRIVATE|MAP_ANONYMOUS|_MAP_UNINITIALIZED, 0, 0)) /* ----------------------- Chunk representations ----------------------- */ diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c index 550d5b994..f6bf10a93 100644 --- a/libc/stdlib/malloc/malloc.c +++ b/libc/stdlib/malloc/malloc.c @@ -124,7 +124,7 @@ __malloc_from_heap (size_t size, struct heap_free_area **heap MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); #else block = mmap ((void *)0, block_size, PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZE, 0, 0); + MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZED, 0, 0); #endif #endif /* MALLOC_USE_SBRK */ -- cgit v1.2.3