From 1f91c41d4dd9a2321320f1856b01f542e481d8a3 Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Sat, 4 Jul 2009 06:31:31 +0000
Subject: Remove references to config #defines for the thoroughly obsolete
 4.2BSD syslog API.

---
 hunt/Makefile.inc   | 15 ++++++---------
 hunt/huntd/bsd.h    |  7 +------
 hunt/huntd/driver.c |  9 ++-------
 3 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'hunt')

diff --git a/hunt/Makefile.inc b/hunt/Makefile.inc
index 72d7268a..21b73a66 100644
--- a/hunt/Makefile.inc
+++ b/hunt/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.7 2003/06/11 12:10:21 wiz Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2009/07/04 06:31:31 dholland Exp $
 #
 #
 #  Hunt
@@ -52,17 +52,14 @@ GAME_PARAM=	-DRANDOM -DREFLECT -DMONITOR -DOOZE -DFLY -DVOLCANO -DBOOTS \
 # System parameter flags are:
 #	DEBUG		Don't trust everything in the code
 #	INTERNET	Use the Internet domain IPC instead of UNIX domain
-#	LOG		Use syslog error-logging in driver (needs SYSLOG_42 or
-#			or SYSLOG_43)
+#	LOG		Use syslog error-logging in driver
 #	OLDIPC		Use 4.1a internet system calls (must also define
 #			INTERNET)
 #	TERMINFO	Use terminfo instead of termcap
-#	SYSLOG_42	Use 4.2 BSD syslog(3)
-#	SYSLOG_43	Use 4.2 BSD syslog(3)
 #	LOG		Use syslog(3) for logging errors
 #	BSD_RELEASE	Which version of BSD distribution
-#			42 is 4.2BSD (implies SYSLOG_42)
-#			43 is 4.3BSD (implies BROADCAST, SYSLOG_43)
+#			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
@@ -70,9 +67,9 @@ GAME_PARAM=	-DRANDOM -DREFLECT -DMONITOR -DOOZE -DFLY -DVOLCANO -DBOOTS \
 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 -DSYSLOG_43 -DBROADCAST -DSIGNAL_TYPE=void
+DEFS_SUN4_0=	-DINTERNET -DLOG -DBROADCAST -DSIGNAL_TYPE=void
 DEFS_ULTRIX=	-DINTERNET -DLOG -DBSD_RELEASE=42 -DSIGNAL_TYPE=void
-DEFS_HPUX=	-DHPUX -DINTERNET -DLOG -DSYSLOG_43 -DBROADCAST -DTERMINFO -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
diff --git a/hunt/huntd/bsd.h b/hunt/huntd/bsd.h
index 8880093b..6763cbf0 100644
--- a/hunt/huntd/bsd.h
+++ b/hunt/huntd/bsd.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bsd.h,v 1.5 2009/07/04 04:29:54 dholland Exp $	*/
+/*	$NetBSD: bsd.h,v 1.6 2009/07/04 06:31:31 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
@@ -33,9 +33,4 @@
 
 #if defined(BSD_RELEASE) && BSD_RELEASE >= 43
 #define BROADCAST
-#define SYSLOG_43
-#endif
-
-#if defined(BSD_RELEASE) && BSD_RELEASE == 42
-#define SYSLOG_42
 #endif
diff --git a/hunt/huntd/driver.c b/hunt/huntd/driver.c
index f1d79297..86c3a5d7 100644
--- a/hunt/huntd/driver.c
+++ b/hunt/huntd/driver.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: driver.c,v 1.17 2009/07/04 04:29:54 dholland Exp $	*/
+/*	$NetBSD: driver.c,v 1.18 2009/07/04 06:31:31 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.17 2009/07/04 04:29:54 dholland Exp $");
+__RCSID("$NetBSD: driver.c,v 1.18 2009/07/04 06:31:31 dholland Exp $");
 #endif /* not lint */
 
 #include <sys/ioctl.h>
@@ -279,12 +279,7 @@ init(void)
 	(void) signal(SIGPIPE, SIG_IGN);
 
 #ifdef LOG
-#ifdef	SYSLOG_43
 	openlog("huntd", LOG_PID, LOG_DAEMON);
-#endif
-#ifdef	SYSLOG_42
-	openlog("huntd", LOG_PID);
-#endif
 #endif
 
 	/*
-- 
cgit v1.2.3-56-ge451