From 5b76eed8435d83619f278cc1584ca5751e2804f6 Mon Sep 17 00:00:00 2001
From: perry <perry@NetBSD.org>
Date: Sat, 15 Dec 2007 19:44:37 +0000
Subject: convert __attribute__s to applicable cdefs.h macros

---
 adventure/init.c                |  6 +++---
 arithmetic/arithmetic.c         | 10 +++++-----
 atc/graphics.c                  |  6 +++---
 atc/input.c                     | 32 ++++++++++++++++----------------
 atc/log.c                       |  6 +++---
 atc/update.c                    |  6 +++---
 backgammon/backgammon/main.c    |  6 +++---
 backgammon/common_source/subs.c |  6 +++---
 backgammon/teachgammon/teach.c  |  6 +++---
 battlestar/command6.c           |  6 +++---
 battlestar/fly.c                |  8 ++++----
 boggle/boggle/mach.c            | 10 +++++-----
 canfield/canfield/canfield.c    | 10 +++++-----
 cribbage/io.c                   |  6 +++---
 cribbage/score.c                |  6 +++---
 dm/dm.c                         |  8 ++++----
 factor/factor.c                 |  6 +++---
 fish/fish.c                     |  6 +++---
 fortune/fortune/fortune.c       |  8 ++++----
 fortune/strfile/strfile.c       |  6 +++---
 fortune/unstr/unstr.c           |  6 +++---
 gomoku/main.c                   |  6 +++---
 gomoku/pickmove.c               |  6 +++---
 hack/hack.apply.c               | 10 +++++-----
 hack/hack.end.c                 |  8 ++++----
 hack/hack.pager.c               |  6 +++---
 hack/hack.rip.c                 |  6 +++---
 hack/hack.save.c                |  6 +++---
 hangman/main.c                  |  6 +++---
 hunt/hunt/hunt.c                | 16 ++++++++--------
 hunt/hunt/otto.c                |  6 +++---
 hunt/huntd/faketalk.c           |  6 +++---
 mille/mille.c                   |  6 +++---
 mille/print.c                   |  6 +++---
 monop/monop.c                   |  6 +++---
 number/number.c                 |  6 +++---
 phantasia/io.c                  |  4 ++--
 phantasia/setup.c               |  4 ++--
 pig/pig.c                       |  6 +++---
 pom/pom.c                       |  6 +++---
 primes/primes.c                 |  6 +++---
 quiz/quiz.c                     |  6 +++---
 rain/rain.c                     |  6 +++---
 random/random.c                 |  6 +++---
 robots/main.c                   |  6 +++---
 rogue/init.c                    | 10 +++++-----
 sail/pl_1.c                     |  8 ++++----
 sail/pl_7.c                     |  6 +++---
 snake/snake/snake.c             | 10 +++++-----
 tetris/screen.c                 |  4 ++--
 tetris/tetris.c                 |  8 ++++----
 trek/abandon.c                  |  6 +++---
 trek/capture.c                  |  6 +++---
 trek/cgetc.c                    |  6 +++---
 trek/computer.c                 |  6 +++---
 trek/dcrept.c                   |  6 +++---
 trek/destruct.c                 |  6 +++---
 trek/dock.c                     |  8 ++++----
 trek/dumpgame.c                 |  6 +++---
 trek/help.c                     |  6 +++---
 trek/impulse.c                  |  6 +++---
 trek/lrscan.c                   |  6 +++---
 trek/phaser.c                   |  6 +++---
 trek/play.c                     |  6 +++---
 trek/rest.c                     |  6 +++---
 trek/setwarp.c                  |  6 +++---
 trek/torped.c                   |  6 +++---
 trek/visual.c                   |  6 +++---
 worm/worm.c                     | 10 +++++-----
 worms/worms.c                   |  8 ++++----
 wump/wump.c                     |  6 +++---
 71 files changed, 250 insertions(+), 250 deletions(-)

diff --git a/adventure/init.c b/adventure/init.c
index 51877047..5269b96c 100644
--- a/adventure/init.c
+++ b/adventure/init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.16 2006/03/18 05:16:46 rtr Exp $	*/
+/*	$NetBSD: init.c,v 1.17 2007/12/15 19:44:38 perry Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 6/2/93";
 #else
-__RCSID("$NetBSD: init.c,v 1.16 2006/03/18 05:16:46 rtr Exp $");
+__RCSID("$NetBSD: init.c,v 1.17 2007/12/15 19:44:38 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -275,7 +275,7 @@ linkdata(void)
 
 /* come here if he hits a del */
 void
-trapdel(int n __attribute__((__unused__)))
+trapdel(int n __unused)
 {
 	delhit = 1;		/* main checks, treats as QUIT */
 	signal(SIGINT, trapdel);/* catch subsequent DELs */
diff --git a/arithmetic/arithmetic.c b/arithmetic/arithmetic.c
index 8eff98ee..7e6c2229 100644
--- a/arithmetic/arithmetic.c
+++ b/arithmetic/arithmetic.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: arithmetic.c,v 1.21 2004/11/05 21:30:31 dsl Exp $	*/
+/*	$NetBSD: arithmetic.c,v 1.22 2007/12/15 19:44:38 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)arithmetic.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: arithmetic.c,v 1.21 2004/11/05 21:30:31 dsl Exp $");
+__RCSID("$NetBSD: arithmetic.c,v 1.22 2007/12/15 19:44:38 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -85,13 +85,13 @@ __RCSID("$NetBSD: arithmetic.c,v 1.21 2004/11/05 21:30:31 dsl Exp $");
 #include <unistd.h>
 
 int	getrandom(int, int, int);
-void	intr(int) __attribute__((__noreturn__));
+void	intr(int) __dead;
 int	main(int, char *[]);
 int	opnum(int);
 void	penalise(int, int, int);
 int	problem(void);
 void	showstats(int);
-void	usage(void) __attribute__((__noreturn__));
+void	usage(void) __dead;
 
 const char keylist[] = "+-x/";
 const char defaultkeys[] = "+-";
@@ -159,7 +159,7 @@ main(argc, argv)
 /* Handle interrupt character.  Print score and exit. */
 void
 intr(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	showstats(1);
 	exit(0);
diff --git a/atc/graphics.c b/atc/graphics.c
index 3e082ad2..9d9ba6fb 100644
--- a/atc/graphics.c
+++ b/atc/graphics.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: graphics.c,v 1.13 2006/06/07 09:22:52 jnemeth Exp $	*/
+/*	$NetBSD: graphics.c,v 1.14 2007/12/15 19:44:38 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)graphics.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: graphics.c,v 1.13 2006/06/07 09:22:52 jnemeth Exp $");
+__RCSID("$NetBSD: graphics.c,v 1.14 2007/12/15 19:44:38 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -282,7 +282,7 @@ ioerror(int pos, int len, const char *str)
 
 /* ARGSUSED */
 void
-quit(int dummy __attribute__((__unused__)))
+quit(int dummy __unused)
 {
 	int			c, y, x;
 #ifdef BSD
diff --git a/atc/input.c b/atc/input.c
index 44310133..215c3c30 100644
--- a/atc/input.c
+++ b/atc/input.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: input.c,v 1.21 2006/10/07 18:29:02 elad Exp $	*/
+/*	$NetBSD: input.c,v 1.22 2007/12/15 19:44:38 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: input.c,v 1.21 2006/10/07 18:29:02 elad Exp $");
+__RCSID("$NetBSD: input.c,v 1.22 2007/12/15 19:44:38 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -371,7 +371,7 @@ setplane(int c)
 
 /* ARGSUSED */
 const char *
-turn(int c __attribute__((__unused__)))
+turn(int c __unused)
 {
 	if (p.altitude == 0)
 		return ("Planes at airports may not change direction");
@@ -380,7 +380,7 @@ turn(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-circle(int c __attribute__((__unused__)))
+circle(int c __unused)
 {
 	if (p.altitude == 0)
 		return ("Planes cannot circle on the ground");
@@ -390,7 +390,7 @@ circle(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-left(int c __attribute__((__unused__)))
+left(int c __unused)
 {
 	dir = D_LEFT;
 	p.new_dir = p.dir - 1;
@@ -401,7 +401,7 @@ left(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-right(int c __attribute__((__unused__)))
+right(int c __unused)
 {
 	dir = D_RIGHT;
 	p.new_dir = p.dir + 1;
@@ -412,7 +412,7 @@ right(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-Left(int c __attribute__((__unused__)))
+Left(int c __unused)
 {
 	p.new_dir = p.dir - 2;
 	if (p.new_dir < 0)
@@ -422,7 +422,7 @@ Left(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-Right(int c __attribute__((__unused__)))
+Right(int c __unused)
 {
 	p.new_dir = p.dir + 2;
 	if (p.new_dir >= MAXDIR)
@@ -476,7 +476,7 @@ delayb(int c)
 
 /* ARGSUSED */
 const char *
-beacon(int c __attribute__((__unused__)))
+beacon(int c __unused)
 {
 	dest_type = T_BEACON;
 	return (NULL);
@@ -484,7 +484,7 @@ beacon(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-ex_it(int c __attribute__((__unused__)))
+ex_it(int c __unused)
 {
 	dest_type = T_EXIT;
 	return (NULL);
@@ -492,7 +492,7 @@ ex_it(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-airport(int c __attribute__((__unused__)))
+airport(int c __unused)
 {
 	dest_type = T_AIRPORT;
 	return (NULL);
@@ -500,7 +500,7 @@ airport(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-climb(int c __attribute__((__unused__)))
+climb(int c __unused)
 {
 	dir = D_UP;
 	return (NULL);
@@ -508,7 +508,7 @@ climb(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-descend(int c __attribute__((__unused__)))
+descend(int c __unused)
 {
 	dir = D_DOWN;
 	return (NULL);
@@ -620,7 +620,7 @@ rel_dir(int c)
 
 /* ARGSUSED */
 const char *
-mark(int c __attribute__((__unused__)))
+mark(int c __unused)
 {
 	if (p.altitude == 0)
 		return ("Cannot mark planes on the ground");
@@ -632,7 +632,7 @@ mark(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-unmark(int c __attribute__((__unused__)))
+unmark(int c __unused)
 {
 	if (p.altitude == 0)
 		return ("Cannot unmark planes on the ground");
@@ -644,7 +644,7 @@ unmark(int c __attribute__((__unused__)))
 
 /* ARGSUSED */
 const char *
-ignore(int c __attribute__((__unused__)))
+ignore(int c __unused)
 {
 	if (p.altitude == 0)
 		return ("Cannot ignore planes on the ground");
diff --git a/atc/log.c b/atc/log.c
index ce437a5c..b333ce5f 100644
--- a/atc/log.c
+++ b/atc/log.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: log.c,v 1.18 2006/06/07 09:30:35 jnemeth Exp $	*/
+/*	$NetBSD: log.c,v 1.19 2007/12/15 19:44:38 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: log.c,v 1.18 2006/06/07 09:30:35 jnemeth Exp $");
+__RCSID("$NetBSD: log.c,v 1.19 2007/12/15 19:44:38 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -293,7 +293,7 @@ log_score(int list_em)
 
 /* ARGSUSED */
 void
-log_score_quit(int dummy __attribute__((__unused__)))
+log_score_quit(int dummy __unused)
 {
 	(void)log_score(0);
 	exit(0);
diff --git a/atc/update.c b/atc/update.c
index 84405127..90969937 100644
--- a/atc/update.c
+++ b/atc/update.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: update.c,v 1.18 2006/11/24 21:14:55 wiz Exp $	*/
+/*	$NetBSD: update.c,v 1.19 2007/12/15 19:44:38 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)update.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: update.c,v 1.18 2006/11/24 21:14:55 wiz Exp $");
+__RCSID("$NetBSD: update.c,v 1.19 2007/12/15 19:44:38 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -54,7 +54,7 @@ __RCSID("$NetBSD: update.c,v 1.18 2006/11/24 21:14:55 wiz Exp $");
 
 /* ARGSUSED */
 void
-update(int dummy __attribute__((__unused__)))
+update(int dummy __unused)
 {
 	int	i, dir_diff, unclean;
 	PLANE	*pp, *p1, *p2;
diff --git a/backgammon/backgammon/main.c b/backgammon/backgammon/main.c
index 57c27874..dae7dae9 100644
--- a/backgammon/backgammon/main.c
+++ b/backgammon/backgammon/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.22 2005/07/01 01:12:39 jmc Exp $	*/
+/*	$NetBSD: main.c,v 1.23 2007/12/15 19:44:38 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.22 2005/07/01 01:12:39 jmc Exp $");
+__RCSID("$NetBSD: main.c,v 1.23 2007/12/15 19:44:38 perry Exp $");
 #endif
 #endif				/* not lint */
 
@@ -88,7 +88,7 @@ static const char password[] = "losfurng";
 static char pbuf[10];
 
 int
-main(int argc __attribute__((__unused__)), char **argv)
+main(int argc __unused, char **argv)
 {
 	int     i;		/* non-descript index */
 	int     l;		/* non-descript index */
diff --git a/backgammon/common_source/subs.c b/backgammon/common_source/subs.c
index a95e4813..62529fe0 100644
--- a/backgammon/common_source/subs.c
+++ b/backgammon/common_source/subs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subs.c,v 1.15 2005/07/01 01:12:39 jmc Exp $	*/
+/*	$NetBSD: subs.c,v 1.16 2007/12/15 19:44:39 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)subs.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: subs.c,v 1.15 2005/07/01 01:12:39 jmc Exp $");
+__RCSID("$NetBSD: subs.c,v 1.16 2007/12/15 19:44:39 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -433,7 +433,7 @@ fixtty(struct termios *t)
 }
 
 void
-getout(int dummy __attribute__((__unused__)))
+getout(int dummy __unused)
 {
 	/* go to bottom of screen */
 	if (tflag) {
diff --git a/backgammon/teachgammon/teach.c b/backgammon/teachgammon/teach.c
index 8f197176..5a39fb2f 100644
--- a/backgammon/teachgammon/teach.c
+++ b/backgammon/teachgammon/teach.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: teach.c,v 1.17 2005/07/01 01:12:39 jmc Exp $	*/
+/*	$NetBSD: teach.c,v 1.18 2007/12/15 19:44:39 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)teach.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: teach.c,v 1.17 2005/07/01 01:12:39 jmc Exp $");
+__RCSID("$NetBSD: teach.c,v 1.18 2007/12/15 19:44:39 perry Exp $");
 #endif
 #endif				/* not lint */
 
@@ -60,7 +60,7 @@ const char   *const contin[] = {
 };
 
 int
-main(int argc __attribute__((__unused__)), char *argv[])
+main(int argc __unused, char *argv[])
 {
 	int     i;
 
diff --git a/battlestar/command6.c b/battlestar/command6.c
index c877c1f0..ef324c84 100644
--- a/battlestar/command6.c
+++ b/battlestar/command6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: command6.c,v 1.3 2005/07/01 06:04:54 jmc Exp $	*/
+/*	$NetBSD: command6.c,v 1.4 2007/12/15 19:44:39 perry Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)com6.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: command6.c,v 1.3 2005/07/01 06:04:54 jmc Exp $");
+__RCSID("$NetBSD: command6.c,v 1.4 2007/12/15 19:44:39 perry Exp $");
 #endif
 #endif				/* not lint */
 
@@ -89,7 +89,7 @@ die(void)
 }
 
 void
-diesig(int dummy __attribute__((__unused__)))
+diesig(int dummy __unused)
 {
 	die();
 }
diff --git a/battlestar/fly.c b/battlestar/fly.c
index e2e298d3..6affb9d6 100644
--- a/battlestar/fly.c
+++ b/battlestar/fly.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fly.c,v 1.13 2005/07/01 06:04:54 jmc Exp $	*/
+/*	$NetBSD: fly.c,v 1.14 2007/12/15 19:44:39 perry Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)fly.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: fly.c,v 1.13 2005/07/01 06:04:54 jmc Exp $");
+__RCSID("$NetBSD: fly.c,v 1.14 2007/12/15 19:44:39 perry Exp $");
 #endif
 #endif				/* not lint */
 
@@ -61,7 +61,7 @@ static void succumb(int);
 static void target(void);
 
 static void
-succumb(int dummy __attribute__((__unused__)))
+succumb(int dummy __unused)
 {
 	if (oldsig == SIG_DFL) {
 		endfly();
@@ -247,7 +247,7 @@ blast(void)
 }
 
 static void
-moveenemy(int dummy __attribute__((__unused__)))
+moveenemy(int dummy __unused)
 {
 	double  d;
 	int     oldr, oldc;
diff --git a/boggle/boggle/mach.c b/boggle/boggle/mach.c
index b88a5b07..e8a481c2 100644
--- a/boggle/boggle/mach.c
+++ b/boggle/boggle/mach.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach.c,v 1.16 2006/08/09 14:29:40 christos Exp $	*/
+/*	$NetBSD: mach.c,v 1.17 2007/12/15 19:44:39 perry Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)mach.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: mach.c,v 1.16 2006/08/09 14:29:40 christos Exp $");
+__RCSID("$NetBSD: mach.c,v 1.17 2007/12/15 19:44:39 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -577,7 +577,7 @@ tty_setup(void)
 }
 
 static void
-stop_catcher(int signo __attribute__((__unused__)))
+stop_catcher(int signo __unused)
 {
 	sigset_t isigset, osigset;
 
@@ -597,7 +597,7 @@ stop_catcher(int signo __attribute__((__unused__)))
 }
  
 static void
-cont_catcher(int signo __attribute__((__unused__)))
+cont_catcher(int signo __unused)
 {
 	noecho();
 	raw();
@@ -612,7 +612,7 @@ cont_catcher(int signo __attribute__((__unused__)))
  * It would mean reformatting the entire display
  */
 static void
-winch_catcher(int signo __attribute__((__unused__)))
+winch_catcher(int signo __unused)
 {
 	struct winsize win;
 
diff --git a/canfield/canfield/canfield.c b/canfield/canfield/canfield.c
index e7fbefb9..a16ce2e8 100644
--- a/canfield/canfield/canfield.c
+++ b/canfield/canfield/canfield.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: canfield.c,v 1.22 2006/02/25 02:06:08 wiz Exp $	*/
+/*	$NetBSD: canfield.c,v 1.23 2007/12/15 19:44:39 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)canfield.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: canfield.c,v 1.22 2006/02/25 02:06:08 wiz Exp $");
+__RCSID("$NetBSD: canfield.c,v 1.23 2007/12/15 19:44:39 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -199,7 +199,7 @@ time_t acctstart;
 int dbfd = -1;
 
 void	askquit(int);
-void	cleanup(int) __attribute__((__noreturn__));
+void	cleanup(int) __dead;
 void	cleanupboard(void);
 void	clearabovemovebox(void);
 void	clearbelowmovebox(void);
@@ -1720,7 +1720,7 @@ finish(void)
  * procedure to clean up and exit
  */
 void
-cleanup(int dummy __attribute__((__unused__)))
+cleanup(int dummy __unused)
 {
 
 	total.thinktime += 1;
@@ -1743,7 +1743,7 @@ cleanup(int dummy __attribute__((__unused__)))
  * Field an interrupt.
  */
 void
-askquit(int dummy __attribute__((__unused__)))
+askquit(int dummy __unused)
 {
 	move(msgrow, msgcol);
 	printw("Really wish to quit?    ");
diff --git a/cribbage/io.c b/cribbage/io.c
index 12e23b35..ea2fedba 100644
--- a/cribbage/io.c
+++ b/cribbage/io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: io.c,v 1.20 2005/07/02 08:32:32 jmc Exp $	*/
+/*	$NetBSD: io.c,v 1.21 2007/12/15 19:44:39 perry Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: io.c,v 1.20 2005/07/02 08:32:32 jmc Exp $");
+__RCSID("$NetBSD: io.c,v 1.21 2007/12/15 19:44:39 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -557,7 +557,7 @@ getline(void)
 }
 
 void
-receive_intr(int signo __attribute__((__unused__)))
+receive_intr(int signo __unused)
 {
 	bye();
 	exit(1);
diff --git a/cribbage/score.c b/cribbage/score.c
index 4823980d..3c7b4a26 100644
--- a/cribbage/score.c
+++ b/cribbage/score.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: score.c,v 1.12 2007/09/16 18:39:54 ragge Exp $	*/
+/*	$NetBSD: score.c,v 1.13 2007/12/15 19:44:39 perry Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: score.c,v 1.12 2007/09/16 18:39:54 ragge Exp $");
+__RCSID("$NetBSD: score.c,v 1.13 2007/12/15 19:44:39 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -337,7 +337,7 @@ pegscore(CARD crd, const CARD tbl[], int n, int sum)
  * points such a crib will get.
  */
 int
-adjust(const CARD cb[], CARD tnv __attribute__((__unused__)))
+adjust(const CARD cb[], CARD tnv __unused)
 {
 	long scr;
 	int i, c0, c1;
diff --git a/dm/dm.c b/dm/dm.c
index 5cae6605..2518c369 100644
--- a/dm/dm.c
+++ b/dm/dm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dm.c,v 1.23 2006/05/25 07:11:54 dan Exp $	*/
+/*	$NetBSD: dm.c,v 1.24 2007/12/15 19:44:40 perry Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
 #if 0
 static char sccsid[] = "@(#)dm.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dm.c,v 1.23 2006/05/25 07:11:54 dan Exp $");
+__RCSID("$NetBSD: dm.c,v 1.24 2007/12/15 19:44:40 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -72,12 +72,12 @@ void	c_tty(const char *);
 const char *hour(int);
 double	load(void);
 void	nogamefile(void);
-void	play(char **) __attribute__((__noreturn__));
+void	play(char **) __dead;
 void	read_config(void);
 int	users(void);
 
 int
-main(int argc __attribute__((__unused__)), char *argv[])
+main(int argc __unused, char *argv[])
 {
 	char *cp;
 
diff --git a/factor/factor.c b/factor/factor.c
index 05cd445d..2f25d771 100644
--- a/factor/factor.c
+++ b/factor/factor.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: factor.c,v 1.16 2005/06/27 20:49:31 rillig Exp $	*/
+/*	$NetBSD: factor.c,v 1.17 2007/12/15 19:44:40 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)factor.c	8.4 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: factor.c,v 1.16 2005/06/27 20:49:31 rillig Exp $");
+__RCSID("$NetBSD: factor.c,v 1.17 2007/12/15 19:44:40 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -108,7 +108,7 @@ BN_CTX *ctx;				/* just use a global context */
 int	main(int, char *[]);
 void	pr_fact(BIGNUM *);		/* print factors of a value */
 void	BN_print_dec_fp(FILE *, const BIGNUM *);
-void	usage(void) __attribute__((__noreturn__));
+void	usage(void) __dead;
 #ifdef HAVE_OPENSSL
 void	pollard_pminus1(BIGNUM *);	/* print factors for big numbers */
 #else
diff --git a/fish/fish.c b/fish/fish.c
index e6d6b5bd..a324504b 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fish.c,v 1.17 2005/07/02 08:38:24 jmc Exp $	*/
+/*	$NetBSD: fish.c,v 1.18 2007/12/15 19:44:40 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
 #if 0
 static char sccsid[] = "@(#)fish.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: fish.c,v 1.17 2005/07/02 08:38:24 jmc Exp $");
+__RCSID("$NetBSD: fish.c,v 1.18 2007/12/15 19:44:40 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -91,7 +91,7 @@ int	nrandom(int);
 void	printhand(const int *);
 void	printplayer(int);
 int	promove(void);
-void	usage(void) __attribute__((__noreturn__));
+void	usage(void) __dead;
 int	usermove(void);
 
 int
diff --git a/fortune/fortune/fortune.c b/fortune/fortune/fortune.c
index 3a56e9ad..e7bb04c5 100644
--- a/fortune/fortune/fortune.c
+++ b/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fortune.c,v 1.49 2006/05/13 22:28:04 christos Exp $	*/
+/*	$NetBSD: fortune.c,v 1.50 2007/12/15 19:44:40 perry Exp $	*/
 
 /*-
  * Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1993\n\
 #if 0
 static char sccsid[] = "@(#)fortune.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: fortune.c,v 1.49 2006/05/13 22:28:04 christos Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.50 2007/12/15 19:44:40 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -158,7 +158,7 @@ void	 print_file_list(void);
 void	 print_list(FILEDESC *, int);
 void	 sum_noprobs(FILEDESC *);
 void	 sum_tbl(STRFILE *, STRFILE *);
-void	 usage(void) __attribute__((__noreturn__));
+void	 usage(void) __dead;
 void	 zero_tbl(STRFILE *);
 
 #ifndef	NO_REGEX
@@ -808,7 +808,7 @@ is_fortfile(file, datp, posp, check_for_offend)
 	const char	*file;
 	char		**datp, **posp
 # ifndef OK_TO_WRITE_DISK
-	__attribute__((__unused__))
+	__unused
 # endif
 	;
 	int	check_for_offend;
diff --git a/fortune/strfile/strfile.c b/fortune/strfile/strfile.c
index a8bdedcd..e0dae6de 100644
--- a/fortune/strfile/strfile.c
+++ b/fortune/strfile/strfile.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strfile.c,v 1.23 2005/04/19 20:16:19 rillig Exp $	*/
+/*	$NetBSD: strfile.c,v 1.24 2007/12/15 19:44:40 perry Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)strfile.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: strfile.c,v 1.23 2005/04/19 20:16:19 rillig Exp $");
+__RCSID("$NetBSD: strfile.c,v 1.24 2007/12/15 19:44:40 perry Exp $");
 #endif
 #endif /* not lint */
 #endif /* __NetBSD__ */
@@ -144,7 +144,7 @@ STRFILE	Tbl;				/* statistics table */
 STR	*Firstch;			/* first chars of each string */
 
 #ifdef __GNUC__
-#define NORETURN	__attribute__((__noreturn__))
+#define NORETURN	__dead
 #else
 #define NORETURN
 #endif
diff --git a/fortune/unstr/unstr.c b/fortune/unstr/unstr.c
index d5a4a0fe..8d87d9f8 100644
--- a/fortune/unstr/unstr.c
+++ b/fortune/unstr/unstr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: unstr.c,v 1.11 2004/02/08 22:23:50 jsm Exp $	*/
+/*	$NetBSD: unstr.c,v 1.12 2007/12/15 19:44:40 perry Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
 #if 0
 static char sccsid[] = "@(#)unstr.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: unstr.c,v 1.11 2004/02/08 22:23:50 jsm Exp $");
+__RCSID("$NetBSD: unstr.c,v 1.12 2007/12/15 19:44:40 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -86,7 +86,7 @@ void	order_unstr(STRFILE *);
 /* ARGSUSED */
 int
 main(ac, av)
-	int	ac __attribute__((__unused__));
+	int	ac __unused;
 	char	**av;
 {
 	static STRFILE	tbl;		/* description table */
diff --git a/gomoku/main.c b/gomoku/main.c
index 6f01ed03..e707e47e 100644
--- a/gomoku/main.c
+++ b/gomoku/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.12 2004/01/27 20:30:29 jsm Exp $	*/
+/*	$NetBSD: main.c,v 1.13 2007/12/15 19:44:40 perry Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.12 2004/01/27 20:30:29 jsm Exp $");
+__RCSID("$NetBSD: main.c,v 1.13 2007/12/15 19:44:40 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -532,7 +532,7 @@ quit()
 
 void
 quitsig(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	quit();
 }
diff --git a/gomoku/pickmove.c b/gomoku/pickmove.c
index 4360143c..98c8fa4c 100644
--- a/gomoku/pickmove.c
+++ b/gomoku/pickmove.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pickmove.c,v 1.11 2004/01/27 20:26:20 jsm Exp $	*/
+/*	$NetBSD: pickmove.c,v 1.12 2007/12/15 19:44:40 perry Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)pickmove.c	8.2 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: pickmove.c,v 1.11 2004/01/27 20:26:20 jsm Exp $");
+__RCSID("$NetBSD: pickmove.c,v 1.12 2007/12/15 19:44:40 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -1050,7 +1050,7 @@ updatecombo(cbp, color)
 void
 appendcombo(cbp, color)
 	struct combostr *cbp;
-	int color __attribute__((__unused__));
+	int color __unused;
 {
 	struct combostr *pcbp, *ncbp;
 
diff --git a/hack/hack.apply.c b/hack/hack.apply.c
index 391cbf41..6c119503 100644
--- a/hack/hack.apply.c
+++ b/hack/hack.apply.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.apply.c,v 1.8 2004/01/27 20:30:29 jsm Exp $	*/
+/*	$NetBSD: hack.apply.c,v 1.9 2007/12/15 19:44:41 perry Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.apply.c,v 1.8 2004/01/27 20:30:29 jsm Exp $");
+__RCSID("$NetBSD: hack.apply.c,v 1.9 2007/12/15 19:44:41 perry Exp $");
 #endif				/* not lint */
 
 #include	"hack.h"
@@ -137,7 +137,7 @@ xit:
 /* ARGSUSED */
 static void
 use_camera(obj) /* */ 
-	struct obj     *obj __attribute__((__unused__));
+	struct obj     *obj __unused;
 {
 	struct monst *mtmp;
 	if (!getdir(1)) {	/* ask: in what direction? */
@@ -303,7 +303,7 @@ bchit(ddx, ddy, range, sym)
 /* ARGSUSED */
 static void
 use_whistle(obj)
-	struct obj     *obj __attribute__((__unused__));
+	struct obj     *obj __unused;
 {
 	struct monst *mtmp = fmon;
 	pline("You produce a high whistling sound.");
@@ -321,7 +321,7 @@ use_whistle(obj)
 /* ARGSUSED */
 static void
 use_magic_whistle(obj)
-	struct obj     *obj __attribute__((__unused__));
+	struct obj     *obj __unused;
 {
 	struct monst *mtmp = fmon;
 	pline("You produce a strange whistling sound.");
diff --git a/hack/hack.end.c b/hack/hack.end.c
index 51378bf9..0b8a44bc 100644
--- a/hack/hack.end.c
+++ b/hack/hack.end.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.end.c,v 1.7 2006/05/13 22:45:11 christos Exp $	*/
+/*	$NetBSD: hack.end.c,v 1.8 2007/12/15 19:44:41 perry Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.end.c,v 1.7 2006/05/13 22:45:11 christos Exp $");
+__RCSID("$NetBSD: hack.end.c,v 1.8 2007/12/15 19:44:41 perry Exp $");
 #endif				/* not lint */
 
 #include <signal.h>
@@ -86,7 +86,7 @@ dodone()
 /*ARGSUSED*/
 void
 done1(n)
-	int n __attribute__((__unused__));
+	int n __unused;
 {
 	(void) signal(SIGINT, SIG_IGN);
 	pline("Really quit?");
@@ -108,7 +108,7 @@ int             done_hup;
 /*ARGSUSED*/
 void
 done_intr(n)
-	int n __attribute__((__unused__));
+	int n __unused;
 {
 	done_stopprint++;
 	(void) signal(SIGINT, SIG_IGN);
diff --git a/hack/hack.pager.c b/hack/hack.pager.c
index 19063908..b52a6471 100644
--- a/hack/hack.pager.c
+++ b/hack/hack.pager.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.pager.c,v 1.10 2006/04/24 20:08:54 christos Exp $	*/
+/*	$NetBSD: hack.pager.c,v 1.11 2007/12/15 19:44:41 perry Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.pager.c,v 1.10 2006/04/24 20:08:54 christos Exp $");
+__RCSID("$NetBSD: hack.pager.c,v 1.11 2007/12/15 19:44:41 perry Exp $");
 #endif				/* not lint */
 
 /* This file contains the command routine dowhatis() and a pager. */
@@ -131,7 +131,7 @@ static int      got_intrup;
 
 void
 intruph(n)
-	int n __attribute__((__unused__));
+	int n __unused;
 {
 	got_intrup++;
 }
diff --git a/hack/hack.rip.c b/hack/hack.rip.c
index a29a3ea0..9e2ffb79 100644
--- a/hack/hack.rip.c
+++ b/hack/hack.rip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.rip.c,v 1.7 2003/04/02 18:36:39 jsm Exp $	*/
+/*	$NetBSD: hack.rip.c,v 1.8 2007/12/15 19:44:41 perry Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.rip.c,v 1.7 2003/04/02 18:36:39 jsm Exp $");
+__RCSID("$NetBSD: hack.rip.c,v 1.8 2007/12/15 19:44:41 perry Exp $");
 #endif				/* not lint */
 
 #include "hack.h"
@@ -126,7 +126,7 @@ outrip()
 
 void
 center(line, text)
-	int             line __attribute__((__unused__));
+	int             line __unused;
 	char           *text;
 {
 	int             n = strlen(text) / 2;
diff --git a/hack/hack.save.c b/hack/hack.save.c
index fe116bcb..75e5f759 100644
--- a/hack/hack.save.c
+++ b/hack/hack.save.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.save.c,v 1.8 2003/04/02 18:36:40 jsm Exp $	*/
+/*	$NetBSD: hack.save.c,v 1.9 2007/12/15 19:44:41 perry Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.save.c,v 1.8 2003/04/02 18:36:40 jsm Exp $");
+__RCSID("$NetBSD: hack.save.c,v 1.9 2007/12/15 19:44:41 perry Exp $");
 #endif				/* not lint */
 
 #include <signal.h>
@@ -87,7 +87,7 @@ dosave()
 #ifndef NOSAVEONHANGUP
 void
 hangup(n)
-	int n __attribute__((__unused__));
+	int n __unused;
 {
 	(void) dosave0(1);
 	exit(1);
diff --git a/hangman/main.c b/hangman/main.c
index a59e212d..9ac368b4 100644
--- a/hangman/main.c
+++ b/hangman/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.11 2003/08/07 09:37:22 agc Exp $	*/
+/*	$NetBSD: main.c,v 1.12 2007/12/15 19:44:41 perry Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.11 2003/08/07 09:37:22 agc Exp $");
+__RCSID("$NetBSD: main.c,v 1.12 2007/12/15 19:44:41 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -92,7 +92,7 @@ main(argc, argv)
  */
 void
 die(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	mvcur(0, COLS - 1, LINES - 1, 0);
 	endwin();
diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
index e9dd1408..dc06802f 100644
--- a/hunt/hunt/hunt.c
+++ b/hunt/hunt/hunt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hunt.c,v 1.24 2006/05/09 20:18:06 mrg Exp $	*/
+/*	$NetBSD: hunt.c,v 1.25 2007/12/15 19:44:41 perry Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hunt.c,v 1.24 2006/05/09 20:18:06 mrg Exp $");
+__RCSID("$NetBSD: hunt.c,v 1.25 2007/12/15 19:44:41 perry Exp $");
 #endif /* not lint */
 
 # include	<sys/param.h>
@@ -111,8 +111,8 @@ extern int	cur_row, cur_col;
 void	dump_scores(SOCKET);
 long	env_init(long);
 void	fill_in_blanks(void);
-void	leave(int, char *) __attribute__((__noreturn__));
-void	leavex(int, char *) __attribute__((__noreturn__));
+void	leave(int, char *) __dead;
+void	leavex(int, char *) __dead;
 void	fincurs(void);
 int	main(int, char *[]);
 # ifdef INTERNET
@@ -752,7 +752,7 @@ bad_ver()
  */
 SIGNAL_TYPE
 sigterm(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	leavex(0, (char *) NULL);
 	/* NOTREACHED */
@@ -765,7 +765,7 @@ sigterm(dummy)
  */
 SIGNAL_TYPE
 sigusr1(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	leavex(1, "Unable to start driver.  Try again.");
 	/* NOTREACHED */
@@ -778,7 +778,7 @@ sigusr1(dummy)
  */
 SIGNAL_TYPE
 sigalrm(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	return;
 }
@@ -805,7 +805,7 @@ rmnl(s)
  */
 SIGNAL_TYPE
 intr(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	int	ch;
 	int	explained;
diff --git a/hunt/hunt/otto.c b/hunt/hunt/otto.c
index 3c069713..e83d7c86 100644
--- a/hunt/hunt/otto.c
+++ b/hunt/hunt/otto.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: otto.c,v 1.10 2006/03/19 00:00:19 christos Exp $	*/
+/*	$NetBSD: otto.c,v 1.11 2007/12/15 19:44:41 perry Exp $	*/
 # ifdef OTTO
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
@@ -45,7 +45,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: otto.c,v 1.10 2006/03/19 00:00:19 christos Exp $");
+__RCSID("$NetBSD: otto.c,v 1.11 2007/12/15 19:44:41 perry Exp $");
 #endif /* not lint */
 
 # include	<sys/time.h>
@@ -156,7 +156,7 @@ extern	int	Otto_count;
 
 STATIC SIGNAL_TYPE
 nothing(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 }
 
diff --git a/hunt/huntd/faketalk.c b/hunt/huntd/faketalk.c
index 593cb4a0..9489b636 100644
--- a/hunt/huntd/faketalk.c
+++ b/hunt/huntd/faketalk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: faketalk.c,v 1.10 2004/02/08 22:23:50 jsm Exp $	*/
+/*	$NetBSD: faketalk.c,v 1.11 2007/12/15 19:44:41 perry Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: faketalk.c,v 1.10 2004/02/08 22:23:50 jsm Exp $");
+__RCSID("$NetBSD: faketalk.c,v 1.11 2007/12/15 19:44:41 perry Exp $");
 #endif /* not lint */
 
 #include "bsd.h"
@@ -74,7 +74,7 @@ SIGNAL_TYPE	exorcise(int);
 
 SIGNAL_TYPE
 exorcise(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	(void) wait(0);
 }
diff --git a/mille/mille.c b/mille/mille.c
index 320e0d1e..a8d01c11 100644
--- a/mille/mille.c
+++ b/mille/mille.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mille.c,v 1.13 2003/08/07 09:37:25 agc Exp $	*/
+/*	$NetBSD: mille.c,v 1.14 2007/12/15 19:44:41 perry Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1982, 1993\n\
 #if 0
 static char sccsid[] = "@(#)mille.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: mille.c,v 1.13 2003/08/07 09:37:25 agc Exp $");
+__RCSID("$NetBSD: mille.c,v 1.14 2007/12/15 19:44:41 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -139,7 +139,7 @@ main(ac, av)
  */
 void
 rub(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	(void)signal(SIGINT, SIG_IGN);
 	if (getyn(REALLYPROMPT))
diff --git a/mille/print.c b/mille/print.c
index f850371b..83be11b7 100644
--- a/mille/print.c
+++ b/mille/print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.11 2003/08/07 09:37:26 agc Exp $	*/
+/*	$NetBSD: print.c,v 1.12 2007/12/15 19:44:42 perry Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: print.c,v 1.11 2003/08/07 09:37:26 agc Exp $");
+__RCSID("$NetBSD: print.c,v 1.12 2007/12/15 19:44:42 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -121,7 +121,7 @@ prscore(for_real)
 #ifdef EXTRAP
 	bool	for_real;
 #else
-	bool	for_real __attribute__((__unused__));
+	bool	for_real __unused;
 #endif
 {
 	PLAY	*pp;
diff --git a/monop/monop.c b/monop/monop.c
index 48cd7695..1653e136 100644
--- a/monop/monop.c
+++ b/monop/monop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: monop.c,v 1.15 2004/01/27 20:30:30 jsm Exp $	*/
+/*	$NetBSD: monop.c,v 1.16 2007/12/15 19:44:42 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)monop.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: monop.c,v 1.15 2004/01/27 20:30:30 jsm Exp $");
+__RCSID("$NetBSD: monop.c,v 1.16 2007/12/15 19:44:42 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -93,7 +93,7 @@ main(ac, av)
 /*ARGSUSED*/
 static void
 do_quit(n)
-	int n __attribute__((__unused__));
+	int n __unused;
 {
 	quit();
 }
diff --git a/number/number.c b/number/number.c
index 954359fe..e66c92c1 100644
--- a/number/number.c
+++ b/number/number.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: number.c,v 1.10 2004/11/05 21:30:32 dsl Exp $	*/
+/*	$NetBSD: number.c,v 1.11 2007/12/15 19:44:42 perry Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)number.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: number.c,v 1.10 2004/11/05 21:30:32 dsl Exp $");
+__RCSID("$NetBSD: number.c,v 1.11 2007/12/15 19:44:42 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -81,7 +81,7 @@ int	main(int, char *[]);
 int	number(const char *, int);
 void	pfract(int);
 int	unit(int, const char *);
-void	usage(void) __attribute__((__noreturn__));
+void	usage(void) __dead;
 
 int lflag;
 
diff --git a/phantasia/io.c b/phantasia/io.c
index ed6e0ad2..9cff2e43 100644
--- a/phantasia/io.c
+++ b/phantasia/io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: io.c,v 1.10 2007/12/15 16:32:05 perry Exp $	*/
+/*	$NetBSD: io.c,v 1.11 2007/12/15 19:44:42 perry Exp $	*/
 
 /*
  * io.c - input/output routines for Phantasia
@@ -241,7 +241,7 @@ getanswer(choices, def)
 
 void
 catchalarm(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	longjmp(Timeoenv, 1);
 }
diff --git a/phantasia/setup.c b/phantasia/setup.c
index df1f0133..70f3f6e3 100644
--- a/phantasia/setup.c
+++ b/phantasia/setup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.15 2007/12/15 16:32:05 perry Exp $	*/
+/*	$NetBSD: setup.c,v 1.16 2007/12/15 19:44:42 perry Exp $	*/
 
 /*
  * setup.c - set up all files for Phantasia
@@ -10,7 +10,7 @@
 #include "include.h"
 
 int main(int, char *[]);
-void Error(const char *, const char *) __attribute__((__noreturn__));
+void Error(const char *, const char *) __dead;
 double drandom(void);
 
 /**/
diff --git a/pig/pig.c b/pig/pig.c
index 3562097e..9dcae6cd 100644
--- a/pig/pig.c
+++ b/pig/pig.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pig.c,v 1.11 2004/11/05 21:30:32 dsl Exp $	*/
+/*	$NetBSD: pig.c,v 1.12 2007/12/15 19:44:42 perry Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
 #if 0
 static char sccsid[] = "@(#)pig.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: pig.c,v 1.11 2004/11/05 21:30:32 dsl Exp $");
+__RCSID("$NetBSD: pig.c,v 1.12 2007/12/15 19:44:42 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -54,7 +54,7 @@ __RCSID("$NetBSD: pig.c,v 1.11 2004/11/05 21:30:32 dsl Exp $");
 
 int main(int, char *[]);
 void pigout(char *, int);
-void usage(void) __attribute__((__noreturn__));
+void usage(void) __dead;
 
 int
 main(argc, argv)
diff --git a/pom/pom.c b/pom/pom.c
index 3877058d..c7c24176 100644
--- a/pom/pom.c
+++ b/pom/pom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pom.c,v 1.15 2007/01/12 22:43:05 hubertf Exp $	*/
+/*	$NetBSD: pom.c,v 1.16 2007/12/15 19:44:42 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)pom.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pom.c,v 1.15 2007/01/12 22:43:05 hubertf Exp $");
+__RCSID("$NetBSD: pom.c,v 1.16 2007/12/15 19:44:42 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -89,7 +89,7 @@ double	dtor(double);
 int	main(int, char *[]);
 double	potm(double);
 time_t	parsetime(char *);
-void	badformat(void) __attribute__((__noreturn__));
+void	badformat(void) __dead;
 
 int
 main(int argc, char *argv[])
diff --git a/primes/primes.c b/primes/primes.c
index b77a737d..95b90a6e 100644
--- a/primes/primes.c
+++ b/primes/primes.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: primes.c,v 1.12 2004/01/27 20:30:30 jsm Exp $	*/
+/*	$NetBSD: primes.c,v 1.13 2007/12/15 19:44:42 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)primes.c	8.5 (Berkeley) 5/10/95";
 #else
-__RCSID("$NetBSD: primes.c,v 1.12 2004/01/27 20:30:30 jsm Exp $");
+__RCSID("$NetBSD: primes.c,v 1.13 2007/12/15 19:44:42 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -106,7 +106,7 @@ extern const int pattern_size;	/* length of pattern array */
 int	main(int, char *[]);
 void	primes(ubig, ubig);
 ubig	read_num_buf(void);
-void	usage(void) __attribute__((__noreturn__));
+void	usage(void) __dead;
 
 int
 main(argc, argv)
diff --git a/quiz/quiz.c b/quiz/quiz.c
index be4de261..1582ede7 100644
--- a/quiz/quiz.c
+++ b/quiz/quiz.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: quiz.c,v 1.21 2007/01/17 00:30:23 hubertf Exp $	*/
+/*	$NetBSD: quiz.c,v 1.22 2007/12/15 19:44:42 perry Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
 #if 0
 static char sccsid[] = "@(#)quiz.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: quiz.c,v 1.21 2007/01/17 00:30:23 hubertf Exp $");
+__RCSID("$NetBSD: quiz.c,v 1.22 2007/12/15 19:44:42 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -73,7 +73,7 @@ const char	*next_cat(const char *);
 void	 quiz(void);
 void	 score(u_int, u_int, u_int);
 void	 show_index(void);
-void	 usage(void) __attribute__((__noreturn__));
+void	 usage(void) __dead;
 
 int
 main(argc, argv)
diff --git a/rain/rain.c b/rain/rain.c
index 9be00376..31164882 100644
--- a/rain/rain.c
+++ b/rain/rain.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rain.c,v 1.18 2005/08/09 09:15:23 rpaulo Exp $	*/
+/*	$NetBSD: rain.c,v 1.19 2007/12/15 19:44:43 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)rain.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: rain.c,v 1.18 2005/08/09 09:15:23 rpaulo Exp $");
+__RCSID("$NetBSD: rain.c,v 1.19 2007/12/15 19:44:43 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -146,7 +146,7 @@ main(int argc, char **argv)
 
 /* ARGSUSED */
 static void
-onsig(int dummy __attribute__((__unused__)))
+onsig(int dummy __unused)
 {
 	sig_caught = 1;
 }
diff --git a/random/random.c b/random/random.c
index 6b024f74..27cdc98f 100644
--- a/random/random.c
+++ b/random/random.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: random.c,v 1.10 2005/08/10 14:02:26 rpaulo Exp $	*/
+/*	$NetBSD: random.c,v 1.11 2007/12/15 19:44:43 perry Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\
 #if 0
 static char sccsid[] = "@(#)random.c	8.6 (Berkeley) 6/1/94";
 #else
-__RCSID("$NetBSD: random.c,v 1.10 2005/08/10 14:02:26 rpaulo Exp $");
+__RCSID("$NetBSD: random.c,v 1.11 2007/12/15 19:44:43 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@ __RCSID("$NetBSD: random.c,v 1.10 2005/08/10 14:02:26 rpaulo Exp $");
 #define MAXRANDOM	2147483647
 
 int  main(int, char **);
-void usage(void) __attribute__((__noreturn__));
+void usage(void) __dead;
 
 int
 main(argc, argv)
diff --git a/robots/main.c b/robots/main.c
index 85cbefd2..584693e5 100644
--- a/robots/main.c
+++ b/robots/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.21 2004/11/05 21:30:32 dsl Exp $	*/
+/*	$NetBSD: main.c,v 1.22 2007/12/15 19:44:43 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.21 2004/11/05 21:30:32 dsl Exp $");
+__RCSID("$NetBSD: main.c,v 1.22 2007/12/15 19:44:43 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -197,7 +197,7 @@ main(ac, av)
  */
 void
 quit(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	endwin();
 	exit(0);
diff --git a/rogue/init.c b/rogue/init.c
index d077bf22..e50769f5 100644
--- a/rogue/init.c
+++ b/rogue/init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.13 2003/08/07 09:37:38 agc Exp $	*/
+/*	$NetBSD: init.c,v 1.14 2007/12/15 19:44:43 perry Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: init.c,v 1.13 2003/08/07 09:37:38 agc Exp $");
+__RCSID("$NetBSD: init.c,v 1.14 2007/12/15 19:44:43 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -218,7 +218,7 @@ stop_window()
 
 void
 byebye(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	md_ignore_signals();
 	if (ask_quit) {
@@ -231,7 +231,7 @@ byebye(dummy)
 
 void
 onintr(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	md_ignore_signals();
 	if (cant_int) {
@@ -245,7 +245,7 @@ onintr(dummy)
 
 void
 error_save(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	save_is_interactive = 0;
 	save_into_file(error_file);
diff --git a/sail/pl_1.c b/sail/pl_1.c
index f80f5024..5e261056 100644
--- a/sail/pl_1.c
+++ b/sail/pl_1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pl_1.c,v 1.18 2004/01/27 20:23:36 jsm Exp $	*/
+/*	$NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_1.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_1.c,v 1.18 2004/01/27 20:23:36 jsm Exp $");
+__RCSID("$NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -120,14 +120,14 @@ leave(int conditions)
 
 /*ARGSUSED*/
 void
-choke(int n __attribute__((__unused__)))
+choke(int n __unused)
 {
 	leave(LEAVE_QUIT);
 }
 
 /*ARGSUSED*/
 void
-child(int n __attribute__((__unused__)))
+child(int n __unused)
 {
 	int status;
 	int pid;
diff --git a/sail/pl_7.c b/sail/pl_7.c
index 4a3bd62d..30bc28cb 100644
--- a/sail/pl_7.c
+++ b/sail/pl_7.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pl_7.c,v 1.27 2003/08/07 09:37:44 agc Exp $	*/
+/*	$NetBSD: pl_7.c,v 1.28 2007/12/15 19:44:43 perry Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_7.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_7.c,v 1.27 2003/08/07 09:37:44 agc Exp $");
+__RCSID("$NetBSD: pl_7.c,v 1.28 2007/12/15 19:44:43 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -114,7 +114,7 @@ cleanupscreen(void)
 
 /*ARGSUSED*/
 void
-newturn(int n __attribute__((__unused__)))
+newturn(int n __unused)
 {
 	repaired = loaded = fired = changed = 0;
 	movebuf[0] = '\0';
diff --git a/snake/snake/snake.c b/snake/snake/snake.c
index 31504fc4..2e1161a7 100644
--- a/snake/snake/snake.c
+++ b/snake/snake/snake.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: snake.c,v 1.22 2007/01/17 00:30:23 hubertf Exp $	*/
+/*	$NetBSD: snake.c,v 1.23 2007/12/15 19:44:43 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)snake.c	8.2 (Berkeley) 1/7/94";
 #else
-__RCSID("$NetBSD: snake.c,v 1.22 2007/01/17 00:30:23 hubertf Exp $");
+__RCSID("$NetBSD: snake.c,v 1.23 2007/12/15 19:44:43 perry Exp $");
 #endif
 #endif				/* not lint */
 
@@ -122,7 +122,7 @@ void		home(void);
 void		length(int);
 void		logit(const char *);
 int		main(int, char **);
-void		mainloop(void) __attribute__((__noreturn__));
+void		mainloop(void) __dead;
 struct point   *point(struct point *, int, int);
 int		post(int, int);
 int		pushsnake(void);
@@ -131,7 +131,7 @@ void		setup(void);
 void		snap(void);
 void		snrand(struct point *);
 void		spacewarp(int);
-void		stop(int) __attribute__((__noreturn__));
+void		stop(int) __dead;
 int		stretch(const struct point *);
 void		surround(struct point *);
 void		suspend(void);
@@ -974,7 +974,7 @@ winnings(won)
 
 void
 stop(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	signal(SIGINT, SIG_IGN);
 	endwin();
diff --git a/tetris/screen.c b/tetris/screen.c
index 61519997..787a09eb 100644
--- a/tetris/screen.c
+++ b/tetris/screen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: screen.c,v 1.20 2007/12/15 16:32:05 perry Exp $	*/
+/*	$NetBSD: screen.c,v 1.21 2007/12/15 19:44:43 perry Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -64,7 +64,7 @@ static struct termios oldtt;
 static void (*tstp)(int);
 
 static	void	scr_stop(int);
-static	void	stopset(int) __attribute__((__noreturn__));
+static	void	stopset(int) __dead;
 
 
 /*
diff --git a/tetris/tetris.c b/tetris/tetris.c
index 3be171fd..c071fb52 100644
--- a/tetris/tetris.c
+++ b/tetris/tetris.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tetris.c,v 1.17 2004/01/27 20:30:30 jsm Exp $	*/
+/*	$NetBSD: tetris.c,v 1.18 2007/12/15 19:44:43 perry Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -77,8 +77,8 @@ int	showpreview;
 static	void	elide(void);
 static	void	setup_board(void);
 	int	main(int, char **);
-	void	onintr(int) __attribute__((__noreturn__));
-	void	usage(void) __attribute__((__noreturn__));
+	void	onintr(int) __dead;
+	void	usage(void) __dead;
 
 /*
  * Set up the initial board.  The bottom display row is completely set,
@@ -322,7 +322,7 @@ main(argc, argv)
 
 void
 onintr(signo)
-	int signo __attribute__((__unused__));
+	int signo __unused;
 {
 	scr_clear();
 	scr_end();
diff --git a/trek/abandon.c b/trek/abandon.c
index db79d0aa..dc1be461 100644
--- a/trek/abandon.c
+++ b/trek/abandon.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $	*/
+/*	$NetBSD: abandon.c,v 1.7 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)abandon.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $");
+__RCSID("$NetBSD: abandon.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -69,7 +69,7 @@ __RCSID("$NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $");
 /*ARGSUSED*/
 void
 abandon(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	struct quad	*q;
 	int		i;
diff --git a/trek/capture.c b/trek/capture.c
index 700cb7d9..b7fb0e75 100644
--- a/trek/capture.c
+++ b/trek/capture.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: capture.c,v 1.6 2003/08/07 09:37:50 agc Exp $	*/
+/*	$NetBSD: capture.c,v 1.7 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)capture.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: capture.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
+__RCSID("$NetBSD: capture.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -58,7 +58,7 @@ __RCSID("$NetBSD: capture.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
 /*ARGSUSED*/
 void
 capture(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		i;
 	struct kling	*k;
diff --git a/trek/cgetc.c b/trek/cgetc.c
index d1c423d3..9490877f 100644
--- a/trek/cgetc.c
+++ b/trek/cgetc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgetc.c,v 1.6 2003/08/07 09:37:50 agc Exp $	*/
+/*	$NetBSD: cgetc.c,v 1.7 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)cgetc.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: cgetc.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
+__RCSID("$NetBSD: cgetc.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -42,7 +42,7 @@ __RCSID("$NetBSD: cgetc.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
 # include	"trek.h"
 
 char	cgetc(i)
-int	i __attribute__((__unused__));
+int	i __unused;
 {
 	return ( getchar() );
 }
diff --git a/trek/computer.c b/trek/computer.c
index 57f48467..a470cc47 100644
--- a/trek/computer.c
+++ b/trek/computer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: computer.c,v 1.10 2004/01/27 20:30:30 jsm Exp $	*/
+/*	$NetBSD: computer.c,v 1.11 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)computer.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: computer.c,v 1.10 2004/01/27 20:30:30 jsm Exp $");
+__RCSID("$NetBSD: computer.c,v 1.11 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -110,7 +110,7 @@ static void prkalc(int, double);
 /*ARGSUSED*/
 void
 computer(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		ix, iy;
 	int		i, j;
diff --git a/trek/dcrept.c b/trek/dcrept.c
index b57120cd..d6bbd852 100644
--- a/trek/dcrept.c
+++ b/trek/dcrept.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dcrept.c,v 1.6 2003/08/07 09:37:50 agc Exp $	*/
+/*	$NetBSD: dcrept.c,v 1.7 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dcrept.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dcrept.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
+__RCSID("$NetBSD: dcrept.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,7 +56,7 @@ __RCSID("$NetBSD: dcrept.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
 /*ARGSUSED*/
 void
 dcrept(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		i, f;
 	double		x;
diff --git a/trek/destruct.c b/trek/destruct.c
index fdf3dada..6f22517b 100644
--- a/trek/destruct.c
+++ b/trek/destruct.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: destruct.c,v 1.7 2003/08/07 09:37:50 agc Exp $	*/
+/*	$NetBSD: destruct.c,v 1.8 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)destruct.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: destruct.c,v 1.7 2003/08/07 09:37:50 agc Exp $");
+__RCSID("$NetBSD: destruct.c,v 1.8 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -67,7 +67,7 @@ __RCSID("$NetBSD: destruct.c,v 1.7 2003/08/07 09:37:50 agc Exp $");
 /*ARGSUSED*/
 void
 destruct(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	char		checkpass[15];
 	int	i, j;
diff --git a/trek/dock.c b/trek/dock.c
index 9a373a7f..b9ba43e1 100644
--- a/trek/dock.c
+++ b/trek/dock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dock.c,v 1.6 2003/08/07 09:37:50 agc Exp $	*/
+/*	$NetBSD: dock.c,v 1.7 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dock.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dock.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
+__RCSID("$NetBSD: dock.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ __RCSID("$NetBSD: dock.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
 /*ARGSUSED*/
 void
 dock(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		i, j;
 	int		ok;
@@ -133,7 +133,7 @@ dock(v)
 /*ARGSUSED*/
 void
 undock(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	struct event	*e;
 	int		i;
diff --git a/trek/dumpgame.c b/trek/dumpgame.c
index e9c20120..83c5e6ff 100644
--- a/trek/dumpgame.c
+++ b/trek/dumpgame.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumpgame.c,v 1.10 2006/03/19 01:00:35 christos Exp $	*/
+/*	$NetBSD: dumpgame.c,v 1.11 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dumpgame.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dumpgame.c,v 1.10 2006/03/19 01:00:35 christos Exp $");
+__RCSID("$NetBSD: dumpgame.c,v 1.11 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -83,7 +83,7 @@ struct dump	Dump_template[] =
 /*ARGSUSED*/
 void
 dumpgame(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		version;
 	int		fd;
diff --git a/trek/help.c b/trek/help.c
index d4c6c42e..b1150e3a 100644
--- a/trek/help.c
+++ b/trek/help.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: help.c,v 1.7 2003/08/07 09:37:52 agc Exp $	*/
+/*	$NetBSD: help.c,v 1.8 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)help.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: help.c,v 1.7 2003/08/07 09:37:52 agc Exp $");
+__RCSID("$NetBSD: help.c,v 1.8 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -69,7 +69,7 @@ const char	*const Cntvect[3] =
 /*ARGSUSED*/
 void
 help(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		i;
 	double		dist, x;
diff --git a/trek/impulse.c b/trek/impulse.c
index 23039778..50ceeca8 100644
--- a/trek/impulse.c
+++ b/trek/impulse.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: impulse.c,v 1.6 2003/08/07 09:37:52 agc Exp $	*/
+/*	$NetBSD: impulse.c,v 1.7 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)impulse.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: impulse.c,v 1.6 2003/08/07 09:37:52 agc Exp $");
+__RCSID("$NetBSD: impulse.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -49,7 +49,7 @@ __RCSID("$NetBSD: impulse.c,v 1.6 2003/08/07 09:37:52 agc Exp $");
 /*ARGSUSED*/
 void
 impulse(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		course;
 	int		power;
diff --git a/trek/lrscan.c b/trek/lrscan.c
index 0cc00459..3e18baeb 100644
--- a/trek/lrscan.c
+++ b/trek/lrscan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lrscan.c,v 1.6 2003/08/07 09:37:52 agc Exp $	*/
+/*	$NetBSD: lrscan.c,v 1.7 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)lrscan.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lrscan.c,v 1.6 2003/08/07 09:37:52 agc Exp $");
+__RCSID("$NetBSD: lrscan.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,7 +56,7 @@ __RCSID("$NetBSD: lrscan.c,v 1.6 2003/08/07 09:37:52 agc Exp $");
 /*ARGSUSED*/
 void
 lrscan(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		i, j;
 	struct quad	*q;
diff --git a/trek/phaser.c b/trek/phaser.c
index e4f6dc3d..4fbd784e 100644
--- a/trek/phaser.c
+++ b/trek/phaser.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: phaser.c,v 1.9 2003/08/07 09:37:53 agc Exp $	*/
+/*	$NetBSD: phaser.c,v 1.10 2007/12/15 19:44:44 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)phaser.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: phaser.c,v 1.9 2003/08/07 09:37:53 agc Exp $");
+__RCSID("$NetBSD: phaser.c,v 1.10 2007/12/15 19:44:44 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -95,7 +95,7 @@ struct banks
 /*ARGSUSED*/
 void
 phaser(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		i;
 	int		j;
diff --git a/trek/play.c b/trek/play.c
index a4dd6ebc..ad9cf927 100644
--- a/trek/play.c
+++ b/trek/play.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: play.c,v 1.8 2003/08/07 09:37:53 agc Exp $	*/
+/*	$NetBSD: play.c,v 1.9 2007/12/15 19:44:45 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)play.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: play.c,v 1.8 2003/08/07 09:37:53 agc Exp $");
+__RCSID("$NetBSD: play.c,v 1.9 2007/12/15 19:44:45 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -87,7 +87,7 @@ const struct cvntab	Comtab[] =
 /*ARGSUSED*/
 void
 myreset(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 
 	longjmp(env, 1);
diff --git a/trek/rest.c b/trek/rest.c
index 2077de80..d4478c6f 100644
--- a/trek/rest.c
+++ b/trek/rest.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rest.c,v 1.6 2003/08/07 09:37:53 agc Exp $	*/
+/*	$NetBSD: rest.c,v 1.7 2007/12/15 19:44:45 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)rest.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: rest.c,v 1.6 2003/08/07 09:37:53 agc Exp $");
+__RCSID("$NetBSD: rest.c,v 1.7 2007/12/15 19:44:45 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ __RCSID("$NetBSD: rest.c,v 1.6 2003/08/07 09:37:53 agc Exp $");
 /*ARGSUSED*/
 void
 rest(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	double		t;
 	int		percent;
diff --git a/trek/setwarp.c b/trek/setwarp.c
index 449d65fb..17f87450 100644
--- a/trek/setwarp.c
+++ b/trek/setwarp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setwarp.c,v 1.6 2003/08/07 09:37:54 agc Exp $	*/
+/*	$NetBSD: setwarp.c,v 1.7 2007/12/15 19:44:45 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setwarp.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: setwarp.c,v 1.6 2003/08/07 09:37:54 agc Exp $");
+__RCSID("$NetBSD: setwarp.c,v 1.7 2007/12/15 19:44:45 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: setwarp.c,v 1.6 2003/08/07 09:37:54 agc Exp $");
 /*ARGSUSED*/
 void
 setwarp(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	double	warpfac;
 
diff --git a/trek/torped.c b/trek/torped.c
index 893a706a..a0e6be7b 100644
--- a/trek/torped.c
+++ b/trek/torped.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: torped.c,v 1.8 2004/01/27 20:30:31 jsm Exp $	*/
+/*	$NetBSD: torped.c,v 1.9 2007/12/15 19:44:45 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)torped.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: torped.c,v 1.8 2004/01/27 20:30:31 jsm Exp $");
+__RCSID("$NetBSD: torped.c,v 1.9 2007/12/15 19:44:45 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -68,7 +68,7 @@ static int randcourse(int);
 /*ARGSUSED*/
 void
 torped(v)
-	int v __attribute__((__unused__));
+	int v __unused;
 {
 	int		ix, iy;
 	double		x, y, dx, dy;
diff --git a/trek/visual.c b/trek/visual.c
index 03f621f0..4137ec61 100644
--- a/trek/visual.c
+++ b/trek/visual.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: visual.c,v 1.6 2003/08/07 09:37:55 agc Exp $	*/
+/*	$NetBSD: visual.c,v 1.7 2007/12/15 19:44:45 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)visual.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: visual.c,v 1.6 2003/08/07 09:37:55 agc Exp $");
+__RCSID("$NetBSD: visual.c,v 1.7 2007/12/15 19:44:45 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,7 @@ struct xy	Visdelta[11] =
 /*ARGSUSED*/
 void
 visual(z)
-	int z __attribute__((__unused__));
+	int z __unused;
 {
 	int		ix, iy;
 	int		co;
diff --git a/worm/worm.c b/worm/worm.c
index f0656c3c..f678e371 100644
--- a/worm/worm.c
+++ b/worm/worm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: worm.c,v 1.25 2004/01/27 20:30:31 jsm Exp $	*/
+/*	$NetBSD: worm.c,v 1.26 2007/12/15 19:44:45 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)worm.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: worm.c,v 1.25 2004/01/27 20:30:31 jsm Exp $");
+__RCSID("$NetBSD: worm.c,v 1.26 2007/12/15 19:44:45 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -80,10 +80,10 @@ int visible_len;
 int lastch;
 char outbuf[BUFSIZ];
 
-void	crash(void) __attribute__((__noreturn__));
+void	crash(void) __dead;
 void	display(const struct body *, char);
 int	main(int, char **);
-void	leave(int) __attribute__((__noreturn__));
+void	leave(int) __dead;
 void	life(void);
 void	newpos(struct body *);
 void	process(int);
@@ -213,7 +213,7 @@ leave(dummy)
 
 void
 wake(dummy)
-	int dummy __attribute__((__unused__));
+	int dummy __unused;
 {
 	signal(SIGALRM, wake);
 	fflush(stdout);
diff --git a/worms/worms.c b/worms/worms.c
index 88fc47a5..bf0c9701 100644
--- a/worms/worms.c
+++ b/worms/worms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: worms.c,v 1.16 2004/09/12 04:51:32 christos Exp $	*/
+/*	$NetBSD: worms.c,v 1.17 2007/12/15 19:44:45 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)worms.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: worms.c,v 1.16 2004/09/12 04:51:32 christos Exp $");
+__RCSID("$NetBSD: worms.c,v 1.17 2007/12/15 19:44:45 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -180,7 +180,7 @@ static struct	worm {
 volatile sig_atomic_t sig_caught = 0;
 
 int	 main(int, char **);
-void	 nomem(void) __attribute__((__noreturn__));
+void	 nomem(void) __dead;
 void	 onsig(int);
 
 int
@@ -340,7 +340,7 @@ main(argc, argv)
 
 void
 onsig(signo)
-	int signo __attribute__((__unused__));
+	int signo __unused;
 {
 	sig_caught = 1;
 }
diff --git a/wump/wump.c b/wump/wump.c
index 1cff6dbc..dc2254ab 100644
--- a/wump/wump.c
+++ b/wump/wump.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wump.c,v 1.20 2006/01/19 21:20:35 garbled Exp $	*/
+/*	$NetBSD: wump.c,v 1.21 2007/12/15 19:44:45 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)wump.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: wump.c,v 1.20 2006/01/19 21:20:35 garbled Exp $");
+__RCSID("$NetBSD: wump.c,v 1.21 2007/12/15 19:44:45 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -133,7 +133,7 @@ void	pit_survive(void);
 int	shoot(char *);
 void	shoot_self(void);
 int	take_action(void);
-void	usage(void) __attribute__((__noreturn__));
+void	usage(void) __dead;
 void	wump_kill(void);
 int	wump_nearby(void);
 
-- 
cgit v1.2.3-56-ge451