From cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8 Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Sat, 25 Feb 2006 04:03:33 +0000
Subject: Merge from trunk. Going pretty good so far. Kind of. Okay, not
 really.

---
 libc/stdlib/malloc/malloc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libc/stdlib/malloc/malloc.c')

diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c
index 6bc8d8773..2ec8b07da 100644
--- a/libc/stdlib/malloc/malloc.c
+++ b/libc/stdlib/malloc/malloc.c
@@ -11,14 +11,14 @@
  * Written by Miles Bader <miles@gnu.org>
  */
 
-#define mmap __mmap
-#define sbrk __sbrk
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/mman.h>
 
+libc_hidden_proto(mmap)
+libc_hidden_proto(sbrk)
+
 #include "malloc.h"
 #include "heap.h"
 
@@ -106,7 +106,7 @@ malloc_from_heap (size_t size, struct heap *heap)
 #else /* !MALLOC_USE_SBRK */
 
       /* Otherwise, use mmap.  */
-#ifdef __ARCH_HAS_MMU__
+#ifdef __ARCH_USE_MMU__
       block = mmap ((void *)0, block_size, PROT_READ | PROT_WRITE,
 		    MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 #else
-- 
cgit v1.2.3