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

Portability fixes: don't declare library functions, include

Browse source 
appropriate headers.  Also remove some unused declarations.
This commit is contained in:
Markus Armbruster 2004-01-15 13:43:50 +00:00
parent 56dce5a8c4
commit 4ce5f988d0
13 changed files with 19 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/client/misc.h
View file

@ -36,29 +36,7 @@
#include <ctype.h>
#include <sys/types.h>
#include <ctype.h>
#ifdef hpux
#include <string.h>
#else
#ifdef _WIN32
#include <string.h>
typedef unsigned char u_char;
typedef unsigned short u_short;
#else
#include <strings.h>
#endif
#endif
#define MAXNOC 100
#define WORLD_X 32
#define WORLD_Y 16
#define ETUS 60 /* Defined here.. may be overridden later,
but things still use this define */
typedef u_char natid; /* also change NSC_NATID in nsc.h */
#if !defined(aix) && !defined(sgi)
#ifndef ultrix /* already defined in ultrix */
typedef char s_char; /* change to signed char for aix */
@ -67,65 +45,5 @@ typedef char s_char; /* change to signed char for aix */
typedef signed char s_char;
#endif /* !aix && !sgi */
typedef short coord; /* also change NSC_COORD in nsc.h */
/*
* watch it; your compiler might not like this.
* If you think this is bogus, look at /usr/include/struct.h
*/
#define OFFSET(stype, oset) ((int)(&(((struct stype *)0)->oset)))
#define SETOFF(sinst, oset) ((s_char *) (sinst) + (oset))
#ifndef bit
#define bit(x) (1<<(x))
#endif
#define minutes(x) (60*(x))
#define hours(x) (60*60*(x))
#define days(x) (60*60*24*(x))
typedef void (*voidfunc) ();
/* return codes from command routines */
#define RET_OK 0 /* command completed sucessfully */
#define RET_FAIL 1 /* command completed unsucessfully [?] */
#define RET_SYN 2 /* syntax error in command */
#define RET_SYS 3 /* system error (missing file, etc) */
#define MAX_DISTPATH_LEN 10 /* Has to go somewhere */
/*
* references to library functions which aren't related to any
* particular object, and are of general interest
*/
extern long random();
extern double dmax();
extern double dmin();
extern s_char *fmt();
extern s_char *numstr();
extern s_char *esplur();
extern s_char *splur();
extern s_char *iesplur();
extern s_char *plur();
extern s_char *getstarg();
extern s_char *getstring();
/*
* frequently used libc functions
*/
#ifndef _WIN32
extern s_char *malloc();
extern s_char *calloc();
#endif
#if (!defined (aix) && !defined (sgi))
extern s_char *ctime();
extern s_char *strncpy();
extern s_char *strcpy();
#endif /* !aix && !sgi */
extern time_t time();
extern double atof();
#endif