fix redundant decls and nested externs

diff --git a/atc/extern.h b/atc/extern.h
index 7931c3ec49fbb14e3c3584a1a813cd780260838c..5cf47224b757e8d665e008dcbf53bca63cf3fb4a 100644 (file)
--- a/atc/extern.h
+++ b/atc/extern.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.8 1999/07/17 19:57:03 hubertf Exp $       */
+/*     $NetBSD: extern.h,v 1.9 2001/02/05 00:22:52 christos Exp $      */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -110,7 +110,9 @@ int         too_close __P((const PLANE *p1, const PLANE *p2, int));
 void           update __P((int));
 int            yyerror __P((const char *));
 int            yylex __P((void));
+#ifndef YYEMPTY
 int            yyparse __P((void));
+#endif
 const char     *Left __P((char));
 const char     *Right __P((char));
 const char     *airport __P((char));

diff --git a/atc/main.c b/atc/main.c
index da545c6970792f0069465cd9306b28b52da3479e..73508872498c7bc41319e9577d73bd2c5294fc04 100644 (file)
--- a/atc/main.c
+++ b/atc/main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.11 2000/05/08 07:56:01 mycroft Exp $        */
+/*     $NetBSD: main.c,v 1.12 2001/02/05 00:22:52 christos Exp $       */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -55,13 +55,14 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.11 2000/05/08 07:56:01 mycroft Exp $");
+__RCSID("$NetBSD: main.c,v 1.12 2001/02/05 00:22:52 christos Exp $");
 #endif
 #endif /* not lint */
 
 #include "include.h"
 #include "pathnames.h"
 
+extern FILE    *yyin;
 
 int
 main(ac, av)
@@ -214,7 +215,6 @@ int
 read_file(s)
        const char      *s;
 {
-       extern FILE     *yyin;
        int             retval;
 
        file = s;