empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

inet_ntoa() is available on all machines that matter, and defining it

Browse source 
ourselves without adequate auto-configuration creates more problems
than it solves.  In particular since we defined it with the wrong
type.
This commit is contained in:
Markus Armbruster 2004-02-29 11:41:08 +00:00
parent f6d7ebb480
commit d500806bc8
3 changed files with 2 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/prototypes.h
View file

@ -208,9 +208,6 @@ extern int roll(int);
extern int roundavg(double); extern int roundavg(double);
extern int chance(double); extern int chance(double);
extern void disassoc(void); extern void disassoc(void);
#if !defined(_WIN32)
extern s_char *inet_ntoa(struct in_addr);
#endif
extern int diffx(int, int); extern int diffx(int, int);
extern int diffy(int, int); extern int diffy(int, int);
extern int deltax(int, int); extern int deltax(int, int);

4
src/lib/gen/Makefile
View file

@ -36,14 +36,14 @@ LIB = $(SRCDIR)/lib/libgen.a
NTLIB = $(SRCDIR)\lib\libgen.lib NTLIB = $(SRCDIR)\lib\libgen.lib
OBJS = atoip.o chance.o copy.o disassoc.o \ 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 \ ioqueue.o mapdist.o minmax.o numstr.o onearg.o \
parse.o plur.o queue.o round.o scthash.o \ parse.o plur.o queue.o round.o scthash.o \
strdup.o strdup.o
NTOBJS = atoip.obj chance.obj copy.obj disassoc.obj \ NTOBJS = atoip.obj chance.obj copy.obj disassoc.obj \
emp_config.obj getstarg.obj getstring.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 \ numstr.obj onearg.obj parse.obj plur.obj queue.obj round.obj \
scthash.obj strdup.obj scthash.obj strdup.obj

53
src/lib/gen/inet.c
View file

@ -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 <sys/types.h>
#if !defined(_WIN32)
#include <netinet/in.h>
#endif
#include <stdio.h> /* 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 */