diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index cc251da9d453..1dbdfc3ccb71 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec.c,v 1.11 1997/07/04 21:23:58 christos Exp $	*/
+/*	$NetBSD: exec.c,v 1.12 1998/07/26 14:53:46 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)exec.c	8.3 (Berkeley) 5/23/95";
 #else
-__RCSID("$NetBSD: exec.c,v 1.11 1997/07/04 21:23:58 christos Exp $");
+__RCSID("$NetBSD: exec.c,v 1.12 1998/07/26 14:53:46 mycroft Exp $");
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,7 @@ extern char **environ;
  * is not in the last component of the search path, so we must
  * go on after first detecting the error.
  */
-static char *exerr;		/* Execution error message */
+static const char *exerr;	/* Execution error message */
 static Char *expath;		/* Path for exerr */
 
 /*
diff --git a/lib/libpcap/pcap.c b/lib/libpcap/pcap.c
index b89053cbdf93..0541c9a16fb2 100644
--- a/lib/libpcap/pcap.c
+++ b/lib/libpcap/pcap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcap.c,v 1.5 1997/10/03 15:53:16 christos Exp $	*/
+/*	$NetBSD: pcap.c,v 1.6 1998/07/26 14:49:36 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1995, 1996
@@ -39,7 +39,7 @@
 static const char rcsid[] =
     "@(#) Header: pcap.c,v 1.27 96/11/27 18:43:25 leres Exp  (LBL)";
 #else
-__RCSID("$NetBSD: pcap.c,v 1.5 1997/10/03 15:53:16 christos Exp $");
+__RCSID("$NetBSD: pcap.c,v 1.6 1998/07/26 14:49:36 mycroft Exp $");
 #endif
 #endif
 
@@ -168,7 +168,7 @@ pcap_geterr(pcap_t *p)
 /*
  * Not all systems have strerror().
  */
-char *
+const char *
 pcap_strerror(int errnum)
 {
 #ifdef HAVE_STRERROR
diff --git a/lib/libpcap/pcap.h b/lib/libpcap/pcap.h
index 8d557a2c9d9c..f50ae1d6cd7b 100644
--- a/lib/libpcap/pcap.h
+++ b/lib/libpcap/pcap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcap.h,v 1.6 1997/10/03 15:53:17 christos Exp $	*/
+/*	$NetBSD: pcap.h,v 1.7 1998/07/26 14:49:36 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1995, 1996
@@ -113,7 +113,8 @@ const u_char*
 int	pcap_stats(pcap_t *, struct pcap_stat *);
 int	pcap_setfilter(pcap_t *, struct bpf_program *);
 void	pcap_perror(pcap_t *, char *);
-char	*pcap_strerror(int);
+const char*
+	pcap_strerror(int);
 char	*pcap_geterr(pcap_t *);
 int	pcap_compile(pcap_t *, struct bpf_program *, char *, int,
 	    bpf_u_int32);