diff options
| author |   deraadt <deraadt@openbsd.org> | 1998-01-02 05:32:47 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1998-01-02 05:32:47 +0000 |
| commit | 24293f8d10f8c69b01eefa399d5acaa90e698aa3 (patch) | |
| tree | 80e422e089aee65d4876caebf1f5f1a64e39b156 /lib/libc/stdlib/malloc.c | |
| parent | man page error; helbig (diff) | |
| download | wireguard-openbsd-24293f8d10f8c69b01eefa399d5acaa90e698aa3.tar.xz wireguard-openbsd-24293f8d10f8c69b01eefa399d5acaa90e698aa3.zip | |
make mmap() return void *, add MAP_FAILED
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 66d1a2a9daf..9aadc494f90 100644 --- a/lib/libc/stdlib/malloc.c +++ b/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; } |