6268906 ucbcmd/plot and gcc don't get along

6271073 gcc and cmd/fmt don't get along
6271996 gcc and cmd/mail don't get along
6272084 gcc and cmd/pax don't get along
6273914 gcc and cmd/tar don't get along

--HG--
rename : usr/src/cmd/fmt/head.c => deleted_files/usr/src/cmd/fmt/head.c
rename : usr/src/cmd/mail/maid.c => deleted_files/usr/src/cmd/mail/maid.c

1 files changed, 7 insertions, 7 deletions

diff --git a/usr/src/cmd/mail/main.c b/usr/src/cmd/mail/main.c
index ffe89d581c..009e02cb3b 100644
--- a/usr/src/cmd/mail/main.c
+++ b/usr/src/cmd/mail/main.c
@@ -19,14 +19,14 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "mail.h"
@@ -39,8 +39,8 @@
  *	mail [ -tw ] [ -m messagetype ] persons
  *	rmail [ -tw ] persons
  */
-main(argc, argv)
-char	**argv;
+int
+main(int argc, char **argv)
 {
 	register int i;
 	char *cptr, *p;
@@ -240,5 +240,5 @@ char	**argv;
 		sending = TRUE;
 		sendmail(argc, argv);
 	}
-	done(0); /*NOTREACHED*/
+	done(0);
 }