From d6724a84e4ba41305086422afc071d9c8b92c09b Mon Sep 17 00:00:00 2001 From: dholland Date: Sat, 29 Mar 2014 21:24:26 +0000 Subject: Split hunt and huntd's includes, instead of incestuously sharing a pile of external data and function declarations between the two programs. Common constants and defines now go in hunt_common.h. Stuff that belongs only to hunt is in hunt/hunt_private.h. Stuff that belongs only to huntd is in huntd/hunt.h. Copy some declarations that are used in both programs under the same names (but are not actually the same objects) from huntd/hunt.h to hunt/hunt_private.h. Move others that are only used in hunt. Remove some entirely unused material, and tidy up standard includes. --- hunt/huntd/pathname.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'hunt/huntd/pathname.c') diff --git a/hunt/huntd/pathname.c b/hunt/huntd/pathname.c index e0016c55..4bb94034 100644 --- a/hunt/huntd/pathname.c +++ b/hunt/huntd/pathname.c @@ -1,4 +1,4 @@ -/* $NetBSD: pathname.c,v 1.5 2009/07/04 04:29:55 dholland Exp $ */ +/* $NetBSD: pathname.c,v 1.6 2014/03/29 21:24:26 dholland Exp $ */ /* * Copyright (c) 1983-2003, Regents of the University of California. * All rights reserved. @@ -32,7 +32,7 @@ #include #ifndef lint -__RCSID("$NetBSD: pathname.c,v 1.5 2009/07/04 04:29:55 dholland Exp $"); +__RCSID("$NetBSD: pathname.c,v 1.6 2014/03/29 21:24:26 dholland Exp $"); #endif /* not lint */ /* @@ -43,11 +43,12 @@ __RCSID("$NetBSD: pathname.c,v 1.5 2009/07/04 04:29:55 dholland Exp $"); #include +#include "hunt_common.h" + #ifdef DEBUG -char *Driver = "/home/socr/a/conrad/games/src/hunt/huntd.dbg"; #ifdef INTERNET -u_short Test_port = ('h' << 8) | 't'; +u_short Test_port = TEST_PORT; #else char *Sock_name = "/tmp/hunt"; char *Stat_name = "/tmp/hunt.stats"; @@ -55,9 +56,8 @@ char *Stat_name = "/tmp/hunt.stats"; #else -const char *Driver = HUNTD; #ifdef INTERNET -u_short Test_port = ('h' << 8) | 't'; +u_short Test_port = TEST_PORT; #else char *Sock_name = "/tmp/hunt"; char *Stat_name = "/tmp/hunt.stats"; -- cgit v1.2.3