From 321c551969cc862a859c9e79c8404af90c94e81d Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Sun, 25 Apr 1999 21:13:34 +0000
Subject: First set of fixes to keep egcs happy.  These include {} around
 single statement if blocks[*] when the else could be ambiguous, not
 defaulting to int type and removal of some unused variables.

[*] This is explicitly allowed by style(9) when the single statement
spans more than one line.

Reviewed by: obrien, chuckr
---
 bin/sh/arith_lex.l | 6 +++---
 bin/sh/input.c     | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'bin/sh')

diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index b5ca746..ef29c12 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: arith_lex.l,v 1.11 1998/08/24 10:20:36 cracauer Exp $
+ *	$Id: arith_lex.l,v 1.12 1998/08/25 09:33:34 cracauer Exp $
  */
 
 #ifndef lint
@@ -42,14 +42,14 @@
 static char sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: arith_lex.l,v 1.12 1998/08/25 09:33:34 cracauer Exp $";
 #endif /* not lint */
 
 #include <unistd.h>
 #include "y.tab.h"
 #include "error.h"
 
-extern yylval;
+extern int yylval;
 extern char *arith_buf, *arith_startbuf;
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) \
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 1c9f2ad..f44749c 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: input.c,v 1.11 1998/05/18 06:43:45 charnier Exp $";
 #endif /* not lint */
 
 #include <stdio.h>	/* defines BUFSIZ */
@@ -232,7 +232,6 @@ preadbuffer()
 	char *p, *q;
 	int more;
 	int something;
-	extern EditLine *el;
 	char savec;
 
 	if (parsefile->strpush) {
-- 
cgit v1.1