diff --git a/include/prototypes.h b/include/prototypes.h index 1a6a9e9b..5b71daf9 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -208,9 +208,6 @@ extern int roll(int); extern int roundavg(double); extern int chance(double); extern void disassoc(void); -#if !defined(_WIN32) -extern s_char *inet_ntoa(struct in_addr); -#endif extern int diffx(int, int); extern int diffy(int, int); extern int deltax(int, int); diff --git a/src/lib/gen/Makefile b/src/lib/gen/Makefile index a5998aa4..677b31f9 100644 --- a/src/lib/gen/Makefile +++ b/src/lib/gen/Makefile @@ -36,14 +36,14 @@ LIB = $(SRCDIR)/lib/libgen.a NTLIB = $(SRCDIR)\lib\libgen.lib OBJS = atoip.o chance.o copy.o disassoc.o \ - emp_config.o getstarg.o getstring.o inet.o io.o \ + emp_config.o getstarg.o getstring.o io.o \ ioqueue.o mapdist.o minmax.o numstr.o onearg.o \ parse.o plur.o queue.o round.o scthash.o \ strdup.o NTOBJS = atoip.obj chance.obj copy.obj disassoc.obj \ emp_config.obj getstarg.obj getstring.obj \ - inet.obj io.obj ioqueue.obj mapdist.obj minmax.obj \ + io.obj ioqueue.obj mapdist.obj minmax.obj \ numstr.obj onearg.obj parse.obj plur.obj queue.obj round.obj \ scthash.obj strdup.obj diff --git a/src/lib/gen/inet.c b/src/lib/gen/inet.c deleted file mode 100644 index 20b58ec6..00000000 --- a/src/lib/gen/inet.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak, - * Ken Stevens, Steve McClure - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * --- - * - * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the - * related information and legal notices. It is expected that any future - * projects/authors will amend these files as needed. - * - * --- - * - * inet.c: network format conversion routines - * - * Known contributors to this file: - * Doug Hay, 1998 - */ - -#include -#if !defined(_WIN32) -#include -#endif -#include /* sprintf */ -#include "misc.h" -#include "gen.h" - -#if !defined(NeXT) && !defined(_WIN32) -s_char * -inet_ntoa(struct in_addr addr) -{ - static s_char str[18]; - register u_char *p; - - p = (u_char *)&addr; - sprintf(str, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); - return str; -} -#endif /* NeXT */