diff options
-rw-r--r-- | lib/libc/sys/madvise.2 | 4 | ||||
-rw-r--r-- | lib/libc/sys/mincore.2 | 4 | ||||
-rw-r--r-- | lib/libc/sys/minherit.2 | 4 | ||||
-rw-r--r-- | lib/libc/sys/mlock.2 | 4 | ||||
-rw-r--r-- | lib/libc/sys/mmap.2 | 4 | ||||
-rw-r--r-- | lib/libc/sys/mmap.c | 6 | ||||
-rw-r--r-- | lib/libc/sys/mprotect.2 | 2 | ||||
-rw-r--r-- | lib/libc/sys/msync.2 | 2 | ||||
-rw-r--r-- | lib/libc/sys/munmap.2 | 2 | ||||
-rw-r--r-- | sys/sys/mman.h | 22 | ||||
-rw-r--r-- | sys/sys/types.h | 4 |
11 files changed, 29 insertions, 29 deletions
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2 index 25068b4..75c23dc 100644 --- a/lib/libc/sys/madvise.2 +++ b/lib/libc/sys/madvise.2 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)madvise.2 8.1 (Berkeley) 6/9/93 -.\" $Id: madvise.2,v 1.10 1997/02/22 15:04:03 peter Exp $ +.\" $Id: madvise.2,v 1.11 1997/12/30 05:17:33 alex Exp $ .\" .Dd Jul 19, 1996 .Dt MADVISE 2 @@ -42,7 +42,7 @@ .Fd #include <sys/types.h> .Fd #include <sys/mman.h> .Ft int -.Fn madvise "caddr_t addr" "size_t len" "int behav" +.Fn madvise "void *addr" "size_t len" "int behav" .Sh DESCRIPTION The .Fn madvise diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2 index da72049..5c83de2 100644 --- a/lib/libc/sys/mincore.2 +++ b/lib/libc/sys/mincore.2 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mincore.2 8.1 (Berkeley) 6/9/93 -.\" $Id: mincore.2,v 1.8 1997/02/22 15:04:05 peter Exp $ +.\" $Id: mincore.2,v 1.9 1997/12/30 04:05:47 alex Exp $ .\" .Dd June 9, 1993 .Dt MINCORE 2 @@ -42,7 +42,7 @@ .Fd #include <sys/types.h> .Fd #include <sys/mman.h> .Ft int -.Fn mincore "caddr_t addr" "size_t len" "char *vec" +.Fn mincore "const void *addr" "size_t len" "char *vec" .Sh DESCRIPTION The .Fn mincore diff --git a/lib/libc/sys/minherit.2 b/lib/libc/sys/minherit.2 index a8ebed3..631c175 100644 --- a/lib/libc/sys/minherit.2 +++ b/lib/libc/sys/minherit.2 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: minherit.2,v 1.4 1997/02/22 15:04:06 peter Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -43,7 +43,7 @@ .Fd #include <sys/types.h> .Fd #include <sys/mman.h> .Ft int -.Fn minherit "caddr_t addr" "size_t len" "int inherit" +.Fn minherit "void *addr" "size_t len" "int inherit" .Sh DESCRIPTION The .Fn minherit diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2 index 15ce741..6770173 100644 --- a/lib/libc/sys/mlock.2 +++ b/lib/libc/sys/mlock.2 @@ -42,9 +42,9 @@ .Fd #include <sys/types.h> .Fd #include <sys/mman.h> .Ft int -.Fn mlock "caddr_t addr" "size_t len" +.Fn mlock "const void *addr" "size_t len" .Ft int -.Fn munlock "caddr_t addr" "size_t len" +.Fn munlock "const void *addr" "size_t len" .Sh DESCRIPTION The .Fn mlock diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2 index 17a3603..174a083 100644 --- a/lib/libc/sys/mmap.2 +++ b/lib/libc/sys/mmap.2 @@ -40,8 +40,8 @@ .Sh SYNOPSIS .Fd #include <sys/types.h> .Fd #include <sys/mman.h> -.Ft caddr_t -.Fn mmap "caddr_t addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset" +.Ft void * +.Fn mmap "void * addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset" .Sh DESCRIPTION The .Fn mmap diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c index 67da734..c011692 100644 --- a/lib/libc/sys/mmap.c +++ b/lib/libc/sys/mmap.c @@ -43,9 +43,9 @@ static char sccsid[] = "@(#)mmap.c 8.1 (Berkeley) 6/17/93"; * This function provides 64-bit offset padding that * is not supplied by GCC 1.X but is supplied by GCC 2.X. */ -caddr_t +void * mmap(addr, len, prot, flags, fd, offset) - caddr_t addr; + void * addr; size_t len; int prot; int flags; @@ -53,6 +53,6 @@ mmap(addr, len, prot, flags, fd, offset) off_t offset; { - return((caddr_t)__syscall((quad_t)SYS_mmap, addr, len, prot, flags, + return((void *)__syscall((quad_t)SYS_mmap, addr, len, prot, flags, fd, 0, offset)); } diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2 index d4e28d7..e76fceb 100644 --- a/lib/libc/sys/mprotect.2 +++ b/lib/libc/sys/mprotect.2 @@ -41,7 +41,7 @@ .Fd #include <sys/types.h> .Fd #include <sys/mman.h> .Ft int -.Fn mprotect "caddr_t addr" "size_t len" "int prot" +.Fn mprotect "const void *addr" "size_t len" "int prot" .Sh DESCRIPTION The .Fn mprotect diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2 index dcb4f70..4f4fc6a 100644 --- a/lib/libc/sys/msync.2 +++ b/lib/libc/sys/msync.2 @@ -41,7 +41,7 @@ .Fd #include <sys/types.h> .Fd #include <sys/mman.h> .Ft int -.Fn msync "caddr_t addr" "size_t len" "int flags" +.Fn msync "void *addr" "size_t len" "int flags" .Sh DESCRIPTION The .Fn msync diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2 index ffa2371..63df238 100644 --- a/lib/libc/sys/munmap.2 +++ b/lib/libc/sys/munmap.2 @@ -41,7 +41,7 @@ .Fd #include <sys/types.h> .Fd #include <sys/mman.h> .Ft int -.Fn munmap "caddr_t addr" "size_t len" +.Fn munmap "void *addr" "size_t len" .Sh DESCRIPTION The .Fn munmap diff --git a/sys/sys/mman.h b/sys/sys/mman.h index ddc9c76..f1a054b 100644 --- a/sys/sys/mman.h +++ b/sys/sys/mman.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mman.h 8.2 (Berkeley) 1/9/95 - * $Id: mman.h,v 1.18 1997/04/13 15:38:09 bde Exp $ + * $Id: mman.h,v 1.19 1997/12/02 21:30:03 dyson Exp $ */ #ifndef _SYS_MMAN_H_ @@ -66,7 +66,7 @@ /* * Error return from mmap() */ -#define MAP_FAILED ((caddr_t)-1) +#define MAP_FAILED ((void *)-1) /* * msync() flags @@ -105,18 +105,18 @@ #include <sys/cdefs.h> __BEGIN_DECLS +int madvise __P((void *, size_t, int)); +int mincore __P((const void *, size_t, char *)); +int minherit __P((void *, size_t, int)); +int mlock __P((const void *, size_t)); #ifndef _MMAP_DECLARED #define _MMAP_DECLARED -caddr_t mmap __P((caddr_t, size_t, int, int, int, off_t)); +void * mmap __P((void *, size_t, int, int, int, off_t)); #endif -int mprotect __P((caddr_t, size_t, int)); -int munmap __P((caddr_t, size_t)); -int msync __P((caddr_t, size_t, int)); -int mlock __P((caddr_t, size_t)); -int munlock __P((caddr_t, size_t)); -int madvise __P((caddr_t, size_t, int)); -int mincore __P((caddr_t, size_t, char *)); -int minherit __P((caddr_t, size_t, int)); +int mprotect __P((const void *, size_t, int)); +int msync __P((void *, size_t, int)); +int munlock __P((const void *, size_t)); +int munmap __P((void *, size_t)); __END_DECLS #endif /* !KERNEL */ diff --git a/sys/sys/types.h b/sys/sys/types.h index eff637b..767a1be 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.6 (Berkeley) 2/19/95 - * $Id: types.h,v 1.20 1997/04/13 15:38:10 bde Exp $ + * $Id: types.h,v 1.21 1997/05/08 13:50:36 peter Exp $ */ #ifndef _SYS_TYPES_H_ @@ -172,7 +172,7 @@ off_t lseek __P((int, off_t, int)); #endif #ifndef _MMAP_DECLARED #define _MMAP_DECLARED -caddr_t mmap __P((caddr_t, size_t, int, int, int, off_t)); +void * mmap __P((void *, size_t, int, int, int, off_t)); #endif #ifndef _TRUNCATE_DECLARED #define _TRUNCATE_DECLARED |