Index: cbc.c
===================================================================
RCS file: /home/dcvs/src/bin/ed/cbc.c,v
retrieving revision 1.10
diff -u -r1.10 cbc.c
--- cbc.c	6 Apr 2007 23:36:54 -0000	1.10
+++ cbc.c	7 Apr 2007 15:30:54 -0000
@@ -182,7 +182,7 @@
 		/*
 		 * copy it, nul-padded, into the key area
 		 */
-		expand_des_key(msgbuf, p);
+		expand_des_key((char *)msgbuf, p);
 		MEMZERO(p, _PASSWORD_LEN);
 		set_des_key(&msgbuf);
 		MEMZERO(msgbuf, sizeof msgbuf);
Index: main.c
===================================================================
RCS file: /home/dcvs/src/bin/ed/main.c,v
retrieving revision 1.9
diff -u -r1.9 main.c
--- main.c	6 Apr 2007 23:36:54 -0000	1.9
+++ main.c	7 Apr 2007 14:57:02 -0000
@@ -97,15 +97,10 @@
 
 /* ed: line editor */
 int
-main(int argc, char *argv[])
+main(int volatile argc, char **volatile argv)
 {
 	int c, n;
 	long status = 0;
-#if __GNUC__
-	/* Avoid longjmp clobbering */
-	(void) &argc;
-	(void) &argv;
-#endif
 
 	setlocale(LC_ALL, "");