From 90a7b8b0ddece21340e896e8cec8e3f8ef4383d3 Mon Sep 17 00:00:00 2001 From: dholland Date: Sat, 4 Jul 2009 06:38:34 +0000 Subject: Remove config for the return type of signal handlers, which is also a long-dead issue. --- hunt/Makefile.inc | 21 ++++++++++----------- hunt/hunt/hunt.c | 14 +++++++------- hunt/hunt/otto.c | 8 ++++---- hunt/huntd/driver.c | 6 +++--- hunt/huntd/faketalk.c | 8 ++++---- hunt/huntd/hunt.h | 16 ++++++++-------- 6 files changed, 36 insertions(+), 37 deletions(-) (limited to 'hunt') diff --git a/hunt/Makefile.inc b/hunt/Makefile.inc index 21b73a66..7d64e776 100644 --- 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 81702aa3..291f50d5 100644 --- 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 #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 @@ -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 7f7b5dc8..47dd0383 100644 --- 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 #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 @@ -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 86c3a5d7..9d446d5f 100644 --- 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 #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 @@ -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 df948445..6a8a531e 100644 --- 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 #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 2c46ea8d..1b98b276 100644 --- 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); -- cgit v1.2.3-56-ge451