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, 29 insertions, 9 deletions

diff --git a/usr/src/ucbcmd/plot/libplot/aed/line.c b/usr/src/ucbcmd/plot/libplot/aed/line.c
index f1dbe93bf2..e5e8259631 100644
--- a/usr/src/ucbcmd/plot/libplot/aed/line.c
+++ b/usr/src/ucbcmd/plot/libplot/aed/line.c
@@ -1,13 +1,33 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * 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  	*/
 
-
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.1	*/
-
-/*
- * Copyright (c) 1983, 1984 1985, 1986, 1987, 1988, Sun Microsystems, Inc.
- * All Rights Reserved.
- */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "aed.h"
 
@@ -20,8 +40,8 @@
  *	A line is drawn on the screen between (x1, y1) and (x2, y2).
  *---------------------------------------------------------
  */
-line(x1, y1, x2, y2)
-int x1, y1, x2, y2;
+void
+line(int x1, int y1, int x2, int y2)
 {
     setcolor("01");
     putc('Q', stdout);