Module Name: src
Committed By: dholland
Date: Sat Jul 4 06:38:35 UTC 2009
Modified Files:
src/games/hunt: Makefile.inc
src/games/hunt/hunt: hunt.c otto.c
src/games/hunt/huntd: driver.c faketalk.c hunt.h
Log Message:
Remove config for the return type of signal handlers, which is also a
long-dead issue.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/games/hunt/Makefile.inc
cvs rdiff -u -r1.32 -r1.33 src/games/hunt/hunt/hunt.c
cvs rdiff -u -r1.13 -r1.14 src/games/hunt/hunt/otto.c
cvs rdiff -u -r1.18 -r1.19 src/games/hunt/huntd/driver.c
cvs rdiff -u -r1.15 -r1.16 src/games/hunt/huntd/faketalk.c \
src/games/hunt/huntd/hunt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hunt/Makefile.inc
diff -u src/games/hunt/Makefile.inc:1.8 src/games/hunt/Makefile.inc:1.9
--- src/games/hunt/Makefile.inc:1.8 Sat Jul 4 06:31:31 2009
+++ src/games/hunt/Makefile.inc Sat Jul 4 06:38:34 2009
@@ -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 @@
# 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.
Index: src/games/hunt/hunt/hunt.c
diff -u src/games/hunt/hunt/hunt.c:1.32 src/games/hunt/hunt/hunt.c:1.33
--- src/games/hunt/hunt/hunt.c:1.32 Sat Jul 4 05:01:16 2009
+++ src/games/hunt/hunt/hunt.c Sat Jul 4 06:38:34 2009
@@ -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 @@
* sigterm:
* Handle a terminate signal
*/
-SIGNAL_TYPE
+void
sigterm(int dummy __unused)
{
leavex(0, NULL);
@@ -758,7 +758,7 @@
* sigusr1:
* Handle a usr1 signal
*/
-SIGNAL_TYPE
+void
sigusr1(int dummy __unused)
{
leavex(1, "Unable to start driver. Try again.");
@@ -770,7 +770,7 @@
* sigalrm:
* Handle an alarm signal
*/
-SIGNAL_TYPE
+void
sigalrm(int dummy __unused)
{
return;
@@ -795,7 +795,7 @@
* intr:
* Handle a interrupt signal
*/
-SIGNAL_TYPE
+void
intr(int dummy __unused)
{
int ch;
@@ -903,7 +903,7 @@
* tstp:
* Handle stop and start signals
*/
-SIGNAL_TYPE
+void
tstp(int dummy __unused)
{
#if BSD_RELEASE < 44
Index: src/games/hunt/hunt/otto.c
diff -u src/games/hunt/hunt/otto.c:1.13 src/games/hunt/hunt/otto.c:1.14
--- src/games/hunt/hunt/otto.c:1.13 Sat Jul 4 05:01:16 2009
+++ src/games/hunt/hunt/otto.c Sat Jul 4 06:38:34 2009
@@ -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 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)
{
}
Index: src/games/hunt/huntd/driver.c
diff -u src/games/hunt/huntd/driver.c:1.18 src/games/hunt/huntd/driver.c:1.19
--- src/games/hunt/huntd/driver.c:1.18 Sat Jul 4 06:31:31 2009
+++ src/games/hunt/huntd/driver.c Sat Jul 4 06:38:35 2009
@@ -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 @@
* cleanup:
* Exit with the given value, cleaning up any droppings lying around
*/
-SIGNAL_TYPE
+void
cleanup(int eval)
{
PLAYER *pp;
Index: src/games/hunt/huntd/faketalk.c
diff -u src/games/hunt/huntd/faketalk.c:1.15 src/games/hunt/huntd/faketalk.c:1.16
--- src/games/hunt/huntd/faketalk.c:1.15 Sat Jul 4 04:29:54 2009
+++ src/games/hunt/huntd/faketalk.c Sat Jul 4 06:38:35 2009
@@ -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 **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);
Index: src/games/hunt/huntd/hunt.h
diff -u src/games/hunt/huntd/hunt.h:1.15 src/games/hunt/huntd/hunt.h:1.16
--- src/games/hunt/huntd/hunt.h:1.15 Sat Jul 4 04:29:54 2009
+++ src/games/hunt/huntd/hunt.h Sat Jul 4 06:38:35 2009
@@ -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 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);
