diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
index 84be62e6c7da..cd14a7e36f7c 100644
--- a/lib/libc/gen/pw_scan.c
+++ b/lib/libc/gen/pw_scan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pw_scan.c,v 1.2 1998/06/27 05:08:23 thorpej Exp $	*/
+/*	$NetBSD: pw_scan.c,v 1.3 1998/07/26 13:51:44 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pw_scan.c,v 1.2 1998/06/27 05:08:23 thorpej Exp $");
+__RCSID("$NetBSD: pw_scan.c,v 1.3 1998/07/26 13:51:44 mycroft Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -64,7 +64,8 @@ __pw_scan(bp, pw, flags)
 {
 	unsigned long id;
 	int root, inflags;
-	char *p, *sh, *ep;
+	char *p, *ep;
+	const char *sh;
 
 	inflags = 0;
 	if (flags != (int *)NULL) {
diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c
index ddbc78beb26c..756d4d4fa207 100644
--- a/lib/libc/stdio/perror.c
+++ b/lib/libc/stdio/perror.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perror.c,v 1.12 1998/02/16 11:27:15 lukem Exp $	*/
+/*	$NetBSD: perror.c,v 1.13 1998/07/26 13:53:20 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)perror.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: perror.c,v 1.12 1998/02/16 11:27:15 lukem Exp $");
+__RCSID("$NetBSD: perror.c,v 1.13 1998/07/26 13:53:20 mycroft Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -74,7 +74,7 @@ perror(s)
 		v->iov_len = 2;
 		v++;
 	}
-	v->iov_base = __strerror(errno, buf, sizeof(buf));
+	v->iov_base = (char *)__strerror(errno, buf, sizeof(buf));
 	v->iov_len = strlen(v->iov_base);
 	v++;
 	v->iov_base = "\n";