Remove config for the return type of signal handlers, which is also a

long-dead issue.

diff --git a/hunt/Makefile.inc b/hunt/Makefile.inc
index 21b73a66ff83770736688a96be2f5d2d181fdeea..7d64e776a4b0295ba76b77cf72e5f270d17698e1 100644 (file)
--- a/hunt/Makefile.inc
+++ b/hunt/Makefile.inc
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.8 2009/07/04 06:31:31 dholland Exp $
+#      $NetBSD: Makefile.inc,v 1.9 2009/07/04 06:38:34 dholland Exp $
 #
 #
 #  Hunt
@@ -61,18 +61,17 @@ GAME_PARAM= -DRANDOM -DREFLECT -DMONITOR -DOOZE -DFLY -DVOLCANO -DBOOTS \
 #                      42 is 4.2BSD
 #                      43 is 4.3BSD (implies BROADCAST)
 #      USE_CURSES      Use curses for everything (automatic w/TERMINFO)
-#      SIGNAL_TYPE     void or int
 #      HPUX            do special HPUX only hacks
 #
-DEFS_BSD43=    -DINTERNET -DLOG -DBSD_RELEASE=43 -DSIGNAL_TYPE=int
-DEFS_BSD44=    -DINTERNET -DLOG -DBSD_RELEASE=44 -DSIGNAL_TYPE=void -DUSE_CURSES
-DEFS_SUN=      -DINTERNET -DLOG -DBSD_RELEASE=42 -DBROADCAST -DSIGNAL_TYPE=int
-DEFS_SUN4_0=   -DINTERNET -DLOG -DBROADCAST -DSIGNAL_TYPE=void
-DEFS_ULTRIX=   -DINTERNET -DLOG -DBSD_RELEASE=42 -DSIGNAL_TYPE=void
-DEFS_HPUX=     -DHPUX -DINTERNET -DLOG -DBROADCAST -DTERMINFO -DSIGNAL_TYPE=void
-DEFS_SGI=      -DINTERNET -DLOG -DBSD_RELEASE=43 -DTERMINFO -DSIGNAL_TYPE=void
-DEFS_NEXT=     $(DEFS_BSD43) -bsd -Dconst= -DSIGNAL_TYPE=int
-DEFS_OSF1=     -DINTERNET -DLOG -DBSD_RELEASE=43 -DSIGNAL_TYPE=void -D_BSD
+DEFS_BSD43=    -DINTERNET -DLOG -DBSD_RELEASE=43
+DEFS_BSD44=    -DINTERNET -DLOG -DBSD_RELEASE=44 -DUSE_CURSES
+DEFS_SUN=      -DINTERNET -DLOG -DBSD_RELEASE=42 -DBROADCAST
+DEFS_SUN4_0=   -DINTERNET -DLOG -DBROADCAST
+DEFS_ULTRIX=   -DINTERNET -DLOG -DBSD_RELEASE=42
+DEFS_HPUX=     -DHPUX -DINTERNET -DLOG -DBROADCAST -DTERMINFO
+DEFS_SGI=      -DINTERNET -DLOG -DBSD_RELEASE=43 -DTERMINFO
+DEFS_NEXT=     $(DEFS_BSD43) -bsd -Dconst=
+DEFS_OSF1=     -DINTERNET -DLOG -DBSD_RELEASE=43 -D_BSD
 
 #
 # The following flags are used for system specific compilation arguments.

diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
index 81702aa3aeb74e4e97b1ee4b810e0ecde4581ef1..291f50d5fd70b74fd82b199ce6de84c78e8cddc5 100644 (file)
--- a/hunt/hunt/hunt.c
+++ b/hunt/hunt/hunt.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hunt.c,v 1.32 2009/07/04 05:01:16 dholland Exp $       */
+/*     $NetBSD: hunt.c,v 1.33 2009/07/04 06:38:34 dholland 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.32 2009/07/04 05:01:16 dholland Exp $");
+__RCSID("$NetBSD: hunt.c,v 1.33 2009/07/04 06:38:34 dholland Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -746,7 +746,7 @@ bad_ver(void)
  * sigterm:
  *     Handle a terminate signal
  */
-SIGNAL_TYPE
+void
 sigterm(int dummy __unused)
 {
        leavex(0, NULL);
@@ -758,7 +758,7 @@ sigterm(int dummy __unused)
  * sigusr1:
  *     Handle a usr1 signal
  */
-SIGNAL_TYPE
+void
 sigusr1(int dummy __unused)
 {
        leavex(1, "Unable to start driver.  Try again.");
@@ -770,7 +770,7 @@ sigusr1(int dummy __unused)
  * sigalrm:
  *     Handle an alarm signal
  */
-SIGNAL_TYPE
+void
 sigalrm(int dummy __unused)
 {
        return;
@@ -795,7 +795,7 @@ rmnl(char *s)
  * intr:
  *     Handle a interrupt signal
  */
-SIGNAL_TYPE
+void
 intr(int dummy __unused)
 {
        int ch;
@@ -903,7 +903,7 @@ leavex(int eval, const char *mesg)
  * tstp:
  *     Handle stop and start signals
  */
-SIGNAL_TYPE
+void
 tstp(int dummy __unused)
 {
 #if BSD_RELEASE < 44

diff --git a/hunt/hunt/otto.c b/hunt/hunt/otto.c
index 7f7b5dc8c1b9f39e8a1c616c4e9beda93b6899c4..47dd0383f5d8c5a20db0b9ceabedb6f1f2a1987d 100644 (file)
--- a/hunt/hunt/otto.c
+++ b/hunt/hunt/otto.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: otto.c,v 1.13 2009/07/04 05:01:16 dholland Exp $       */
+/*     $NetBSD: otto.c,v 1.14 2009/07/04 06:38:34 dholland 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.13 2009/07/04 05:01:16 dholland Exp $");
+__RCSID("$NetBSD: otto.c,v 1.14 2009/07/04 06:38:34 dholland Exp $");
 #endif /* not lint */
 
 #include <sys/time.h>
@@ -148,13 +148,13 @@ STATIC void face_and_move_direction(int, int);
 STATIC int go_for_ammo(char);
 STATIC void ottolook(int, struct item *);
 STATIC void look_around(void);
-STATIC SIGNAL_TYPE nothing(int);
+STATIC void nothing(int);
 STATIC int stop_look(struct item *, char, int, int);
 STATIC void wander(void);
 
 extern int Otto_count;
 
-STATIC SIGNAL_TYPE
+STATIC void
 nothing(int dummy __unused)
 {
 }

diff --git a/hunt/huntd/driver.c b/hunt/huntd/driver.c
index 86c3a5d7df5f05b4d943e00221d2c8264e7590d5..9d446d5f483776c3cd967c65581b20a1eeb28148 100644 (file)
--- a/hunt/huntd/driver.c
+++ b/hunt/huntd/driver.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: driver.c,v 1.18 2009/07/04 06:31:31 dholland Exp $     */
+/*     $NetBSD: driver.c,v 1.19 2009/07/04 06:38:35 dholland 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: driver.c,v 1.18 2009/07/04 06:31:31 dholland Exp $");
+__RCSID("$NetBSD: driver.c,v 1.19 2009/07/04 06:38:35 dholland Exp $");
 #endif /* not lint */
 
 #include <sys/ioctl.h>
@@ -847,7 +847,7 @@ check_again:
  * cleanup:
  *     Exit with the given value, cleaning up any droppings lying around
  */
-SIGNAL_TYPE
+void
 cleanup(int eval)
 {
        PLAYER *pp;

diff --git a/hunt/huntd/faketalk.c b/hunt/huntd/faketalk.c
index df9484452ec0cffb42a5e2736dca3b962afd427f..6a8a531e78245b18dafb2fc7b8712c02bdc8f6d3 100644 (file)
--- a/hunt/huntd/faketalk.c
+++ b/hunt/huntd/faketalk.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: faketalk.c,v 1.15 2009/07/04 04:29:54 dholland Exp $   */
+/*     $NetBSD: faketalk.c,v 1.16 2009/07/04 06:38:35 dholland 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.15 2009/07/04 04:29:54 dholland Exp $");
+__RCSID("$NetBSD: faketalk.c,v 1.16 2009/07/04 06:38:35 dholland Exp $");
 #endif /* not lint */
 
 #include "bsd.h"
@@ -67,13 +67,13 @@ extern char *First_arg, *Last_arg;
 extern char **environ;
 
 static void do_announce(char *);
-SIGNAL_TYPE exorcise(int);
+void exorcise(int);
 
 /*
  * exorcise - disspell zombies
  */
 
-SIGNAL_TYPE
+void
 exorcise(int dummy __unused)
 {
        (void) wait(0);

diff --git a/hunt/huntd/hunt.h b/hunt/huntd/hunt.h
index 2c46ea8d301d08e8a663f84fe94ccc71f4e613d4..1b98b27626d08a53f14198f766b74b2a8e72bcbc 100644 (file)
--- a/hunt/huntd/hunt.h
+++ b/hunt/huntd/hunt.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: hunt.h,v 1.15 2009/07/04 04:29:54 dholland Exp $       */
+/*     $NetBSD: hunt.h,v 1.16 2009/07/04 06:38:35 dholland Exp $       */
 
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
@@ -477,10 +477,10 @@ void start_driver(void);
 void stmonitor(PLAYER *);
 void stplayer(PLAYER *, int);
 char translate(char);
-SIGNAL_TYPE cleanup(int) __dead;
-SIGNAL_TYPE intr(int);
-SIGNAL_TYPE sigalrm(int);
-SIGNAL_TYPE sigemt(int) __dead;
-SIGNAL_TYPE sigterm(int) __dead;
-SIGNAL_TYPE sigusr1(int) __dead;
-SIGNAL_TYPE tstp(int);
+void cleanup(int) __dead;
+void intr(int);
+void sigalrm(int);
+void sigemt(int) __dead;
+void sigterm(int) __dead;
+void sigusr1(int) __dead;
+void tstp(int);