diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-03-19 06:24:20 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-03-19 06:24:20 +0000 |
| commit | e2f6ebd3f2969753e4ffc337ce5fb6cdf9d74775 (patch) | |
| tree | aa7553e1b76e25ecdaa3aa7a2b8e29d9159f8974 /libc/stdlib/malloc-simple/alloc.c | |
| parent | 6893f5d8b3fdf6ce65274b90b0b4b0bda9107b17 (diff) | |
| download | uClibc-alpine-e2f6ebd3f2969753e4ffc337ce5fb6cdf9d74775.tar.bz2 uClibc-alpine-e2f6ebd3f2969753e4ffc337ce5fb6cdf9d74775.tar.xz | |
Fix up breakage resulting from flipping the sense of some defines. Change from
defining things to "0" in the disabled case to outright undefining them, lest
code that does an "#ifdef FOO" get inadvertantly triggered. Remove now
unneeded lines from Rules.mak which makes the command line smaller and avoids
redundancy (since this stuff is now pulled in via features.h).
-Erik
Diffstat (limited to 'libc/stdlib/malloc-simple/alloc.c')
| -rw-r--r-- | libc/stdlib/malloc-simple/alloc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c index ed1c381a5..02231fbed 100644 --- a/libc/stdlib/malloc-simple/alloc.c +++ b/libc/stdlib/malloc-simple/alloc.c @@ -1,3 +1,4 @@ +#include <features.h> #include <unistd.h> #include <stdio.h> #include <stdlib.h> @@ -67,10 +68,10 @@ void *calloc(size_t num, size_t size) void *malloc(size_t len) { void *result = mmap((void *) 0, len, PROT_READ | PROT_WRITE, -#ifdef __HAS_NO_MMU__ - MAP_SHARED | MAP_ANONYMOUS, 0, 0 -#else +#ifdef __UCLIBC_HAS_MMU__ MAP_PRIVATE | MAP_ANONYMOUS, 0, 0 +#else + MAP_SHARED | MAP_ANONYMOUS, 0, 0 #endif ); |