Date: Tuesday May 1, 2001 @ 21:00 Author: cameron Update of /home/netrek/cvsroot/Vanilla/ntserv In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv1006/ntserv Modified Files: Makefile.in data.c getpath.c ltd_stats.c main.c util.c Removed Files: copyright.h copyright2.h data.h defs.h.in gencmds.h ltd_stats.h packets.h planets.h proto.h salt.h solicit.h struct.h sysdefaults.h warnings.h Log Message: Wed May 2 12:34:59 2001 James Cameron <quozl at us.netrek.org> * all: move include files to own directory. Changes were contributed by Benjamin `Quisar' Lerman <quisar at quisar.ambre.net> and verified by me. **************************************** Index: Vanilla/ntserv/Makefile.in diff -u Vanilla/ntserv/Makefile.in:1.2 Vanilla/ntserv/Makefile.in:1.3 --- Vanilla/ntserv/Makefile.in:1.2 Mon Apr 30 04:34:36 2001 +++ Vanilla/ntserv/Makefile.in Tue May 1 21:00:19 2001 @@ -49,17 +49,16 @@ ${srcdir}/feature.c ${srcdir}/queue.c ${srcdir}/slotmaint.c \ ${srcdir}/wander2.c ${srcdir}/sysdefaults.c ${srcdir}/rsa_key.c -SRC = $(R_FILES) ${srcdir}/data.h defs.h \ - ${srcdir}/planets.h ${srcdir}/struct.h \ - ${srcdir}/packets.h ${srcdir}/copyright.h +SRC = $(R_FILES) data.h defs.h planets.h struct.h \ + packets.h copyright.h LIBS = $(RSA_LIB) $(EXTRALIBS) -INCS = $(RSA_INCS) $(EXTRAINCS) $(DIRS) -I.. -I${srcdir}/.. -I. -I${srcdir} +INCS = $(RSA_INCS) $(EXTRAINCS) -I. -I${srcdir} -I../include -I${srcdir}/../include CFLAGS = $(FLAGS) $(INCS) -LINTFLAGS = -habxc $(RSA_INCS) $(EXTRAINCS) +LINTFLAGS = -habxc $(INCS) all: $(PMAKE) ntserv daemonII Index: Vanilla/ntserv/data.c diff -u Vanilla/ntserv/data.c:1.16 Vanilla/ntserv/data.c:1.17 --- Vanilla/ntserv/data.c:1.16 Tue Aug 15 05:16:28 2000 +++ Vanilla/ntserv/data.c Tue May 1 21:00:19 2001 @@ -1,10 +1,10 @@ -/* $Id: data.c,v 1.16 2000/08/15 10:16:28 xyzzy Exp $ +/* $Id: data.c,v 1.17 2001/05/02 02:00:19 cameron Exp $ */ -#include "../ntserv/copyright.h" -#include "../ntserv/defs.h" -#include "../ntserv/struct.h" -#include "../ntserv/data.h" +#include "copyright.h" +#include "defs.h" +#include "struct.h" +#include "data.h" #include <sys/types.h> /* needed to define fd_set for inputMask */ #include INC_SYS_SELECT Index: Vanilla/ntserv/getpath.c diff -u Vanilla/ntserv/getpath.c:1.4 Vanilla/ntserv/getpath.c:1.5 --- Vanilla/ntserv/getpath.c:1.4 Tue May 23 20:16:31 2000 +++ Vanilla/ntserv/getpath.c Tue May 1 21:00:19 2001 @@ -7,8 +7,8 @@ #include <stdio.h> #include <string.h> -#include "../ntserv/defs.h" -#include "../ntserv/data.h" +#include "defs.h" +#include "data.h" void getpath() { Index: Vanilla/ntserv/ltd_stats.c diff -u Vanilla/ntserv/ltd_stats.c:1.5 Vanilla/ntserv/ltd_stats.c:1.6 --- Vanilla/ntserv/ltd_stats.c:1.5 Thu Jul 20 20:03:51 2000 +++ Vanilla/ntserv/ltd_stats.c Tue May 1 21:00:19 2001 @@ -1,4 +1,4 @@ -/* $Id: ltd_stats.c,v 1.5 2000/07/21 01:03:51 ahn Exp $ +/* $Id: ltd_stats.c,v 1.6 2001/05/02 02:00:19 cameron Exp $ * * Dave Ahn * @@ -16,7 +16,7 @@ * * */ -#include "../config.h" +#include "config.h" #ifdef LTD_STATS Index: Vanilla/ntserv/main.c diff -u Vanilla/ntserv/main.c:1.22 Vanilla/ntserv/main.c:1.23 --- Vanilla/ntserv/main.c:1.22 Fri Feb 2 03:17:52 2001 +++ Vanilla/ntserv/main.c Tue May 1 21:00:19 2001 @@ -21,9 +21,9 @@ #include "struct.h" #include "data.h" #include "packets.h" -#include "../patchlevel.h" +#include "patchlevel.h" #define SVERS -#include "../version.h" +#include "version.h" #ifdef SENDFLAGS #include "../cflags.h" #endif Index: Vanilla/ntserv/util.c diff -u Vanilla/ntserv/util.c:1.3 Vanilla/ntserv/util.c:1.4 --- Vanilla/ntserv/util.c:1.3 Fri Feb 25 21:44:00 2000 +++ Vanilla/ntserv/util.c Tue May 1 21:00:19 2001 @@ -2,7 +2,7 @@ * util.c */ #include "copyright.h" -#include "../config.h" +#include "config.h" #include <stdio.h> #include INC_MATH