5 files changed, 20 insertions, 26 deletions
diff --git a/usr/src/lib/libc/port/gen/madvise.c b/usr/src/lib/libc/port/gen/madvise.c
index 240c750ab6..01e035b369 100644
--- a/usr/src/lib/libc/port/gen/madvise.c
+++ b/usr/src/lib/libc/port/gen/madvise.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "lint.h"
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -35,7 +33,7 @@
  * management of the memory resources of a particular application.
  */
 int
-madvise(caddr_t addr, size_t len, int advice)
+madvise(void *addr, size_t len, int advice)
 {
 	return (memcntl(addr, len, MC_ADVISE, (caddr_t)(intptr_t)advice, 0, 0));
 }
diff --git a/usr/src/lib/libc/port/gen/mlock.c b/usr/src/lib/libc/port/gen/mlock.c
index 10f641dd9d..c1ad03da44 100644
--- a/usr/src/lib/libc/port/gen/mlock.c
+++ b/usr/src/lib/libc/port/gen/mlock.c
@@ -25,9 +25,7 @@
  */
 
 /*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*	  All Rights Reserved	*/
 
 #pragma weak _mlock = mlock
 
@@ -39,7 +37,7 @@
  * Function to lock address range in memory.
  */
 int
-mlock(caddr_t addr, size_t len)
+mlock(const void *addr, size_t len)
 {
-	return (memcntl(addr, len, MC_LOCK, 0, 0, 0));
+	return (memcntl((void *)addr, len, MC_LOCK, 0, 0, 0));
 }
diff --git a/usr/src/lib/libc/port/gen/munlock.c b/usr/src/lib/libc/port/gen/munlock.c
index 9757df0e41..8edbfc79d0 100644
--- a/usr/src/lib/libc/port/gen/munlock.c
+++ b/usr/src/lib/libc/port/gen/munlock.c
@@ -25,9 +25,7 @@
  */
 
 /*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*	  All Rights Reserved	*/
 
 #pragma weak _munlock = munlock
 
@@ -40,7 +38,7 @@
  */
 
 int
-munlock(caddr_t addr, size_t len)
+munlock(const void *addr, size_t len)
 {
-	return (memcntl(addr, len, MC_UNLOCK, 0, 0, 0));
+	return (memcntl((void *)addr, len, MC_UNLOCK, 0, 0, 0));
 }
diff --git a/usr/src/lib/libc/port/threads/scalls.c b/usr/src/lib/libc/port/threads/scalls.c
index 4a62ea76b9..b45468f77a 100644
--- a/usr/src/lib/libc/port/threads/scalls.c
+++ b/usr/src/lib/libc/port/threads/scalls.c
@@ -527,7 +527,7 @@ write(int fd, const void *buf, size_t size)
 
 int
 getmsg(int fd, struct strbuf *ctlptr, struct strbuf *dataptr,
-	int *flagsp)
+    int *flagsp)
 {
 	extern int __getmsg(int, struct strbuf *, struct strbuf *, int *);
 	int rv;
@@ -537,7 +537,7 @@ getmsg(int fd, struct strbuf *ctlptr, struct strbuf *dataptr,
 
 int
 getpmsg(int fd, struct strbuf *ctlptr, struct strbuf *dataptr,
-	int *bandp, int *flagsp)
+    int *bandp, int *flagsp)
 {
 	extern int __getpmsg(int, struct strbuf *, struct strbuf *,
 	    int *, int *);
@@ -548,7 +548,7 @@ getpmsg(int fd, struct strbuf *ctlptr, struct strbuf *dataptr,
 
 int
 putmsg(int fd, const struct strbuf *ctlptr,
-	const struct strbuf *dataptr, int flags)
+    const struct strbuf *dataptr, int flags)
 {
 	extern int __putmsg(int, const struct strbuf *,
 	    const struct strbuf *, int);
@@ -559,7 +559,7 @@ putmsg(int fd, const struct strbuf *ctlptr,
 
 int
 __xpg4_putmsg(int fd, const struct strbuf *ctlptr,
-	const struct strbuf *dataptr, int flags)
+    const struct strbuf *dataptr, int flags)
 {
 	extern int __putmsg(int, const struct strbuf *,
 	    const struct strbuf *, int);
@@ -570,7 +570,7 @@ __xpg4_putmsg(int fd, const struct strbuf *ctlptr,
 
 int
 putpmsg(int fd, const struct strbuf *ctlptr,
-	const struct strbuf *dataptr, int band, int flags)
+    const struct strbuf *dataptr, int band, int flags)
 {
 	extern int __putpmsg(int, const struct strbuf *,
 	    const struct strbuf *, int, int);
@@ -581,7 +581,7 @@ putpmsg(int fd, const struct strbuf *ctlptr,
 
 int
 __xpg4_putpmsg(int fd, const struct strbuf *ctlptr,
-	const struct strbuf *dataptr, int band, int flags)
+    const struct strbuf *dataptr, int band, int flags)
 {
 	extern int __putpmsg(int, const struct strbuf *,
 	    const struct strbuf *, int, int);
@@ -607,7 +607,7 @@ nanosleep(const timespec_t *rqtp, timespec_t *rmtp)
 
 int
 clock_nanosleep(clockid_t clock_id, int flags,
-	const timespec_t *rqtp, timespec_t *rmtp)
+    const timespec_t *rqtp, timespec_t *rmtp)
 {
 	timespec_t reltime;
 	hrtime_t start;
@@ -810,7 +810,7 @@ msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg)
 }
 
 int
-msync(caddr_t addr, size_t len, int flags)
+msync(void *addr, size_t len, int flags)
 {
 	extern int __msync(caddr_t, size_t, int);
 	int rv;
@@ -1007,7 +1007,7 @@ sigsuspend(const sigset_t *set)
 
 int
 _pollsys(struct pollfd *fds, nfds_t nfd, const timespec_t *timeout,
-	const sigset_t *sigmask)
+    const sigset_t *sigmask)
 {
 	extern int __pollsys(struct pollfd *, nfds_t, const timespec_t *,
 	    const sigset_t *);
diff --git a/usr/src/lib/madv/common/madv.c b/usr/src/lib/madv/common/madv.c
index 756825ee34..12a33a19b6 100644
--- a/usr/src/lib/madv/common/madv.c
+++ b/usr/src/lib/madv/common/madv.c
@@ -721,8 +721,8 @@ shmat(int shmid, const void *shmaddr, int shmflag)
 /*
  * mmap interpose
  */
-caddr_t
-mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos)
+void *
+mmap(void *addr, size_t len, int prot, int flags, int fd, off_t pos)
 {
 	static caddr_t (*mmapfunc)() = NULL;
 	caddr_t result;
@@ -774,8 +774,8 @@ mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos)
 /*
  * mmap64 interpose
  */
-caddr_t
-mmap64(caddr_t addr, size_t len, int prot, int flags, int fd, off64_t pos)
+void *
+mmap64(void *addr, size_t len, int prot, int flags, int fd, off64_t pos)
 {
 	static caddr_t (*mmap64func)();
 	caddr_t result;