From e8d65e451699cce2b47f6be41bda1443ce49aa82 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 2 Jan 1998 05:32:49 +0000
Subject: [PATCH] make mmap() return void *, add MAP_FAILED

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

diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 66d1a2a9..9aadc494 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -8,7 +8,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: malloc.c,v 1.29 1997/08/23 10:43:25 pefo Exp $";
+static char rcsid[] = "$OpenBSD: malloc.c,v 1.30 1998/01/02 05:32:49 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -268,7 +268,7 @@ static char *malloc_func;
 
 /* Macro for mmap */
 #define MMAP(size) \
-	mmap((caddr_t)0, (size), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, \
+	mmap((void *)0, (size), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, \
 	    MMAP_FD, (off_t)0);
 
 /*
@@ -391,7 +391,7 @@ malloc_exit()
 /*
  * Allocate a number of pages from the OS
  */
-static caddr_t
+static void *
 map_pages(pages)
     int pages;
 {
@@ -466,7 +466,7 @@ extend_pgdir(index)
     page_dir = new;
 
     /* Now free the old stuff */
-    munmap((caddr_t)old, oldlen);
+    munmap(old, oldlen);
     return 1;
 }