Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

long-dead issue.
This commit is contained in:
dholland 2009-07-04 06:38:34 +00:00
parent 765594d234
commit cda8e486de
6 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
games/hunt/Makefile.inc
View File

@ -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 # Hunt
@ -61,18 +61,17 @@ GAME_PARAM= -DRANDOM -DREFLECT -DMONITOR -DOOZE -DFLY -DVOLCANO -DBOOTS \
# 42 is 4.2BSD # 42 is 4.2BSD
# 43 is 4.3BSD (implies BROADCAST) # 43 is 4.3BSD (implies BROADCAST)
# USE_CURSES Use curses for everything (automatic w/TERMINFO) # USE_CURSES Use curses for everything (automatic w/TERMINFO)
# SIGNAL_TYPE void or int
# HPUX do special HPUX only hacks # HPUX do special HPUX only hacks
# #
DEFS_BSD43= -DINTERNET -DLOG -DBSD_RELEASE=43 -DSIGNAL_TYPE=int DEFS_BSD43= -DINTERNET -DLOG -DBSD_RELEASE=43
DEFS_BSD44= -DINTERNET -DLOG -DBSD_RELEASE=44 -DSIGNAL_TYPE=void -DUSE_CURSES DEFS_BSD44= -DINTERNET -DLOG -DBSD_RELEASE=44 -DUSE_CURSES
DEFS_SUN= -DINTERNET -DLOG -DBSD_RELEASE=42 -DBROADCAST -DSIGNAL_TYPE=int DEFS_SUN= -DINTERNET -DLOG -DBSD_RELEASE=42 -DBROADCAST
DEFS_SUN4_0= -DINTERNET -DLOG -DBROADCAST -DSIGNAL_TYPE=void DEFS_SUN4_0= -DINTERNET -DLOG -DBROADCAST
DEFS_ULTRIX= -DINTERNET -DLOG -DBSD_RELEASE=42 -DSIGNAL_TYPE=void DEFS_ULTRIX= -DINTERNET -DLOG -DBSD_RELEASE=42
DEFS_HPUX= -DHPUX -DINTERNET -DLOG -DBROADCAST -DTERMINFO -DSIGNAL_TYPE=void DEFS_HPUX= -DHPUX -DINTERNET -DLOG -DBROADCAST -DTERMINFO
DEFS_SGI= -DINTERNET -DLOG -DBSD_RELEASE=43 -DTERMINFO -DSIGNAL_TYPE=void DEFS_SGI= -DINTERNET -DLOG -DBSD_RELEASE=43 -DTERMINFO
DEFS_NEXT= $(DEFS_BSD43) -bsd -Dconst= -DSIGNAL_TYPE=int DEFS_NEXT= $(DEFS_BSD43) -bsd -Dconst=
DEFS_OSF1= -DINTERNET -DLOG -DBSD_RELEASE=43 -DSIGNAL_TYPE=void -D_BSD DEFS_OSF1= -DINTERNET -DLOG -DBSD_RELEASE=43 -D_BSD
# #
# The following flags are used for system specific compilation arguments. # The following flags are used for system specific compilation arguments.

14
games/hunt/hunt/hunt.c
View File

@ -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. * Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved. * All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #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 */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -746,7 +746,7 @@ bad_ver(void)
* sigterm: * sigterm:
* Handle a terminate signal * Handle a terminate signal
*/ */
SIGNAL_TYPE void
sigterm(int dummy __unused) sigterm(int dummy __unused)
{ {
leavex(0, NULL); leavex(0, NULL);
@ -758,7 +758,7 @@ sigterm(int dummy __unused)
* sigusr1: * sigusr1:
* Handle a usr1 signal * Handle a usr1 signal
*/ */
SIGNAL_TYPE void
sigusr1(int dummy __unused) sigusr1(int dummy __unused)
{ {
leavex(1, "Unable to start driver. Try again."); leavex(1, "Unable to start driver. Try again.");
@ -770,7 +770,7 @@ sigusr1(int dummy __unused)
* sigalrm: * sigalrm:
* Handle an alarm signal * Handle an alarm signal
*/ */
SIGNAL_TYPE void
sigalrm(int dummy __unused) sigalrm(int dummy __unused)
{ {
return; return;
@ -795,7 +795,7 @@ rmnl(char *s)
* intr: * intr:
* Handle a interrupt signal * Handle a interrupt signal
*/ */
SIGNAL_TYPE void
intr(int dummy __unused) intr(int dummy __unused)
{ {
int ch; int ch;
@ -903,7 +903,7 @@ leavex(int eval, const char *mesg)
* tstp: * tstp:
* Handle stop and start signals * Handle stop and start signals
*/ */
SIGNAL_TYPE void
tstp(int dummy __unused) tstp(int dummy __unused)
{ {
#if BSD_RELEASE < 44 #if BSD_RELEASE < 44

8
games/hunt/hunt/otto.c
View File

@ -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 #ifdef OTTO
/* /*
* Copyright (c) 1983-2003, Regents of the University of California. * Copyright (c) 1983-2003, Regents of the University of California.
@ -45,7 +45,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #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 */ #endif /* not lint */
#include <sys/time.h> #include <sys/time.h>
@ -148,13 +148,13 @@ STATIC void face_and_move_direction(int, int);
STATIC int go_for_ammo(char); STATIC int go_for_ammo(char);
STATIC void ottolook(int, struct item *); STATIC void ottolook(int, struct item *);
STATIC void look_around(void); STATIC void look_around(void);
STATIC SIGNAL_TYPE nothing(int); STATIC void nothing(int);
STATIC int stop_look(struct item *, char, int, int); STATIC int stop_look(struct item *, char, int, int);
STATIC void wander(void); STATIC void wander(void);
extern int Otto_count; extern int Otto_count;
STATIC SIGNAL_TYPE STATIC void
nothing(int dummy __unused) nothing(int dummy __unused)
{ {
} }

6
games/hunt/huntd/driver.c
View File

@ -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. * Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved. * All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #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 */ #endif /* not lint */
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -847,7 +847,7 @@ check_again:
* cleanup: * cleanup:
* Exit with the given value, cleaning up any droppings lying around * Exit with the given value, cleaning up any droppings lying around
*/ */
SIGNAL_TYPE void
cleanup(int eval) cleanup(int eval)
{ {
PLAYER *pp; PLAYER *pp;

8
games/hunt/huntd/faketalk.c
View File

@ -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. * Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved. * All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #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 */ #endif /* not lint */
#include "bsd.h" #include "bsd.h"
@ -67,13 +67,13 @@ extern char *First_arg, *Last_arg;
extern char **environ; extern char **environ;
static void do_announce(char *); static void do_announce(char *);
SIGNAL_TYPE exorcise(int); void exorcise(int);
/* /*
* exorcise - disspell zombies * exorcise - disspell zombies
*/ */
SIGNAL_TYPE void
exorcise(int dummy __unused) exorcise(int dummy __unused)
{ {
(void) wait(0); (void) wait(0);

16
games/hunt/huntd/hunt.h
View File

@ -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. * Copyright (c) 1983-2003, Regents of the University of California.
@ -477,10 +477,10 @@ void start_driver(void);
void stmonitor(PLAYER *); void stmonitor(PLAYER *);
void stplayer(PLAYER *, int); void stplayer(PLAYER *, int);
char translate(char); char translate(char);
SIGNAL_TYPE cleanup(int) __dead; void cleanup(int) __dead;
SIGNAL_TYPE intr(int); void intr(int);
SIGNAL_TYPE sigalrm(int); void sigalrm(int);
SIGNAL_TYPE sigemt(int) __dead; void sigemt(int) __dead;
SIGNAL_TYPE sigterm(int) __dead; void sigterm(int) __dead;
SIGNAL_TYPE sigusr1(int) __dead; void sigusr1(int) __dead;
SIGNAL_TYPE tstp(int); void tstp(int);