6269016 cmd/eqn and gcc don't get along

6272029 gcc and cmd/newform don't get along

1 files changed, 22 insertions, 18 deletions

diff --git a/usr/src/cmd/eqn/integral.c b/usr/src/cmd/eqn/integral.c
index 3132516068..0383c379ec 100644
--- a/usr/src/cmd/eqn/integral.c
+++ b/usr/src/cmd/eqn/integral.c
@@ -1,24 +1,25 @@
+/*
+ * 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  	*/
 
-
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved. The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  */
-     
-/*
- * Copyright (c) 1983, 1984 1985, 1986, 1987, 1988, Sun Microsystems, Inc.
- * All Rights Reserved.
- */
-  
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.1	*/
 
-# include "e.h"
-# include "e.def"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include "e.h"
+#include "e.def"
 
-integral(p, p1, p2) {
+void
+integral(int p, int p1, int p2)
+{
 #ifndef	NEQN
 	if (p1 != 0)
 		printf(".ds %d \\h'-0.4m'\\v'0.4m'\\*(%d\\v'-0.4m'\n", p1, p1);
@@ -31,25 +32,28 @@ integral(p, p1, p2) {
 		bshiftb(p, SUB, p1);
 	else if (p2 != 0)
 		bshiftb(p, SUP, p2);
-	if(dbg)printf(".\tintegral: S%d; h=%d b=%d\n", 
-		p, eht[p], ebase[p]);
+	if (dbg)
+		printf(".\tintegral: S%d; h=%d b=%d\n",
+		    p, eht[p], ebase[p]);
 	lfont[p] = ROM;
 }
 
-setintegral() {
+void
+setintegral(void)
+{
 	char *f;
 
 	yyval = oalloc();
 	f = "\\(is";
 #ifndef NEQN
-	printf(".ds %d \\s%d\\v'.1m'\\s+4%s\\s-4\\v'-.1m'\\s%d\n", 
-		yyval, ps, f, ps);
+	printf(".ds %d \\s%d\\v'.1m'\\s+4%s\\s-4\\v'-.1m'\\s%d\n",
+	    yyval, ps, f, ps);
 	eht[yyval] = VERT(EM(1.15, ps+4));
 	ebase[yyval] = VERT(EM(0.3, ps));
-#else NEQN
+#else	/* NEQN */
 	printf(".ds %d %s\n", yyval, f);
 	eht[yyval] = VERT(2);
 	ebase[yyval] = 0;
-#endif NEQN
+#endif	/* NEQN */
 	lfont[yyval] = rfont[yyval] = ROM;
 }