From 6306fb5e9b7b48c99ea0c28b2fc1bdc93762b2ea Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Mon, 5 Feb 2001 01:12:46 +0000
Subject: fix redundant decls and nested externs

---
 trek/externs.c | 6 ++----
 trek/lose.c    | 8 ++++----
 trek/play.c    | 7 ++++---
 trek/win.c     | 7 ++++---
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'trek')

diff --git a/trek/externs.c b/trek/externs.c
index e06aaa6e..153f0447 100644
--- a/trek/externs.c
+++ b/trek/externs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: externs.c,v 1.6 1999/09/17 17:06:08 jsm Exp $	*/
+/*	$NetBSD: externs.c,v 1.7 2001/02/05 01:12:46 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)externs.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: externs.c,v 1.6 1999/09/17 17:06:08 jsm Exp $");
+__RCSID("$NetBSD: externs.c,v 1.7 2001/02/05 01:12:46 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -109,8 +109,6 @@ struct quad	Quad[NQUADS][NQUADS];
 /* current sector map */
 char	Sect[NSECTS][NSECTS];
 
-const struct device	Device[NDEV];
-
 struct event	Event[MAXEVENTS];	/* dynamic event list; one entry per pending event */
 
 struct Ship_struct Ship;
diff --git a/trek/lose.c b/trek/lose.c
index 7dcf9ce4..4bc2bbda 100644
--- a/trek/lose.c
+++ b/trek/lose.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lose.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $	*/
+/*	$NetBSD: lose.c,v 1.6 2001/02/05 01:12:46 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)lose.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lose.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
+__RCSID("$NetBSD: lose.c,v 1.6 2001/02/05 01:12:46 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,6 +56,8 @@ __RCSID("$NetBSD: lose.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
 **	actions which need be taken are taken.
 */
 
+extern jmp_buf	env;
+
 const char	*const Losemsg[] =
 {
 	"You ran out of time",
@@ -77,8 +79,6 @@ void
 lose(why)
 int	why;
 {
-	extern jmp_buf	env;
-
 	Game.killed = 1;
 	sleep(1);
 	printf("\n%s\n", Losemsg[why - 1]);
diff --git a/trek/play.c b/trek/play.c
index 3fbeac20..3be6b941 100644
--- a/trek/play.c
+++ b/trek/play.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: play.c,v 1.6 1999/09/08 21:45:33 jsm Exp $	*/
+/*	$NetBSD: play.c,v 1.7 2001/02/05 01:12:46 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)play.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: play.c,v 1.6 1999/09/08 21:45:33 jsm Exp $");
+__RCSID("$NetBSD: play.c,v 1.7 2001/02/05 01:12:46 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -58,6 +58,8 @@ __RCSID("$NetBSD: play.c,v 1.6 1999/09/08 21:45:33 jsm Exp $");
 **	on how we are doing after the move.
 */
 
+extern jmp_buf env;
+
 const struct cvntab	Comtab[] =
 {
 	{ "abandon",		"",		abandon,	0 },
@@ -91,7 +93,6 @@ void
 myreset(v)
 	int v __attribute__((__unused__));
 {
-	extern jmp_buf env;
 
 	longjmp(env, 1);
 }
diff --git a/trek/win.c b/trek/win.c
index af12d5a5..5b7c8f24 100644
--- a/trek/win.c
+++ b/trek/win.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: win.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $	*/
+/*	$NetBSD: win.c,v 1.6 2001/02/05 01:12:46 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)win.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: win.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
+__RCSID("$NetBSD: win.c,v 1.6 2001/02/05 01:12:46 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -61,12 +61,13 @@ __RCSID("$NetBSD: win.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
 **	pretty off the wall.
 */
 
+extern jmp_buf env;
+
 void
 win()
 {
 	long		s;
 	const struct cvntab	*p = NULL;
-	extern jmp_buf env;
 
 	sleep(1);
 	printf("\nCongratulations, you have saved the Federation\n");
-- 
cgit v1.2.3-56-ge451