Supply prototypes where possible. This uncovered type errors with
thread entrypoints: (lwpSelect, shutdown_sequence): Parameters didn't match thread entry point prototype. (lwpEntryPoint): Arguments didn't match thread entry point prototype. Change linkage of functions without prototype declaration to static where possible. Remove some superflous declarations, replace others by suitable includes.
This commit is contained in:
parent
7dbb87b0e0
commit
237baffca9
108 changed files with 505 additions and 877 deletions
|
|
@ -31,10 +31,10 @@
|
|||
* Ville Virrankoski, 1995
|
||||
*/
|
||||
|
||||
void fill_update_array();
|
||||
int *get_wp();
|
||||
int gt_bg_nmbr();
|
||||
void pt_bg_nmbr();
|
||||
void get_materials();
|
||||
void fill_update_array(int *bp, struct sctstr *sp);
|
||||
int *get_wp(int *bp, struct sctstr *sp, int cm);
|
||||
int gt_bg_nmbr(int *bp, struct sctstr *sp, int comm);
|
||||
void pt_bg_nmbr(int *bp, struct sctstr *sp, int comm, int amount);
|
||||
void get_materials(struct sctstr *sp, int *bp, int *mvec, int check);
|
||||
|
||||
extern int mil_dbl_pay;
|
||||
|
|
|
|||
|
|
@ -97,9 +97,6 @@ extern int att_fight(int, struct combat *, struct emp_qelem *, double,
|
|||
extern int att_free_lists(struct emp_qelem *, struct emp_qelem *);
|
||||
|
||||
|
||||
extern double att_asupport();
|
||||
extern double att_dsupport();
|
||||
extern double att_mine_dsupport();
|
||||
extern double combat_mob;
|
||||
extern s_char *att_mode[];
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#ifndef _EMTHREAD_H_
|
||||
#define _EMTHREAD_H_
|
||||
|
||||
#include "prototype.h"
|
||||
#include "misc.h"
|
||||
|
||||
#if defined(_WIN32)
|
||||
|
|
@ -66,14 +65,13 @@ typedef struct lwpSem empth_sem_t;
|
|||
#define EMPTH_PRINT 0x1
|
||||
#define EMPTH_STACKCHECK 0x2
|
||||
|
||||
typedef void (*vf_ptr) ();
|
||||
#define EMPTH_KILLED 1
|
||||
typedef struct empth_ctx_t {
|
||||
char *name; /* thread name */
|
||||
char *desc; /* description */
|
||||
void *ud; /* user data */
|
||||
int state; /* my state */
|
||||
vf_ptr ep; /* entry point */
|
||||
void (*ep)(void *); /* entry point */
|
||||
pthread_t id; /* thread id */
|
||||
} empth_t;
|
||||
|
||||
|
|
@ -110,20 +108,19 @@ typedef void empth_sem_t;
|
|||
|
||||
#endif
|
||||
|
||||
int empth_init _PROTO((char **ctx, int flags));
|
||||
empth_t *empth_create _PROTO((int, void (*)(), int,
|
||||
int, char *, char *, void *));
|
||||
empth_t *empth_self();
|
||||
void empth_exit _PROTO((void));
|
||||
void empth_yield _PROTO((void));
|
||||
void empth_terminate _PROTO((empth_t *));
|
||||
void empth_select _PROTO((int fd, int flags));
|
||||
void empth_wakeup _PROTO((empth_t *));
|
||||
void empth_sleep _PROTO((long until));
|
||||
empth_sem_t *empth_sem_create _PROTO((char *name, int count));
|
||||
void empth_sem_signal _PROTO((empth_sem_t *));
|
||||
void empth_sem_wait _PROTO((empth_sem_t *));
|
||||
void empth_alarm _PROTO((int));
|
||||
int empth_init(char **ctx, int flags);
|
||||
empth_t *empth_create(int, void (*)(void *), int, int, char *, char *, void *);
|
||||
empth_t *empth_self(void);
|
||||
void empth_exit(void);
|
||||
void empth_yield(void);
|
||||
void empth_terminate(empth_t *);
|
||||
void empth_select(int fd, int flags);
|
||||
void empth_wakeup(empth_t *);
|
||||
void empth_sleep(long until);
|
||||
empth_sem_t *empth_sem_create(char *name, int count);
|
||||
void empth_sem_signal(empth_sem_t *);
|
||||
void empth_sem_wait(empth_sem_t *);
|
||||
void empth_alarm(int);
|
||||
|
||||
|
||||
#include "prototypes.h" /* must come at end, after defines and typedefs */
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ extern int ef_vars(int, register s_char *, u_char **,
|
|||
u_char **, u_short **);
|
||||
extern int ef_byname(s_char *);
|
||||
|
||||
extern int ef_nbread();
|
||||
extern int ef_nbread(int type, int id, caddr_t ptr);
|
||||
extern struct empfile empfile[];
|
||||
|
||||
#endif /* _FILE_H_ */
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ extern int maxitem;
|
|||
|
||||
/* procedures using/returning this struct */
|
||||
|
||||
extern struct ichrstr *whatitem();
|
||||
extern struct ichrstr *whatitem(s_char *ptr, s_char *prompt);
|
||||
|
||||
extern int itm_maxno;
|
||||
|
||||
|
|
|
|||
|
|
@ -228,10 +228,7 @@ extern int lnd_support(natid, natid, coord, coord);
|
|||
extern int lnd_can_attack(struct lndstr *);
|
||||
extern int lnd_fortify (struct lndstr *lp, int hard_amt);
|
||||
|
||||
void landdamage();
|
||||
void lnd_nav();
|
||||
int lnd_check_nav();
|
||||
double sqrt();
|
||||
s_char *prland();
|
||||
void landdamage(struct lndstr *lp, int dam);
|
||||
s_char *prland(struct lndstr *lp);
|
||||
|
||||
#endif /* _LAND_H_ */
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
*/
|
||||
#ifndef _LWP_H_
|
||||
#define _LWP_H_
|
||||
#include "prototype.h"
|
||||
#ifdef UCONTEXT
|
||||
#include <ucontext.h>
|
||||
#else /* UCONTEXT */
|
||||
|
|
@ -42,7 +41,7 @@ struct lwpProc {
|
|||
#endif /* UCONTEXT */
|
||||
void *sbtm; /* bottom of stack attached to it */
|
||||
int size; /* size of stack */
|
||||
void (*entry) (); /* entry point */
|
||||
void (*entry)(void *); /* entry point */
|
||||
int dead; /* whether the process can be rescheduled */
|
||||
int pri; /* which scheduling queue we're on */
|
||||
long runtime; /* time at which process is restarted */
|
||||
|
|
@ -76,27 +75,27 @@ struct lwpSem {
|
|||
|
||||
#define LWP_MAX_PRIO 8
|
||||
|
||||
struct lwpProc *lwpInitSystem _PROTO((int prio, char **ctxp, int flags));
|
||||
struct lwpProc *lwpCreate _PROTO((int prio, void (*)(), int size,
|
||||
int flags, char *name, char *desc,
|
||||
int argc, char **argv, void *ud));
|
||||
void lwpExit _PROTO((void));
|
||||
void lwpTerminate _PROTO((struct lwpProc * p));
|
||||
void lwpYield _PROTO((void));
|
||||
void lwpSleepFd _PROTO((int fd, int flags));
|
||||
void lwpSleepUntil _PROTO((long until));
|
||||
void lwpWakeupFd _PROTO((struct lwpProc * p));
|
||||
void *lwpGetUD _PROTO((struct lwpProc * p));
|
||||
void lwpSetUD _PROTO((struct lwpProc * p, char *ud));
|
||||
void lwpSetDesc _PROTO((struct lwpProc * p, char *name, char *desc));
|
||||
int lwpSetPriority _PROTO((int prio));
|
||||
void lwpReschedule _PROTO((void));
|
||||
struct lwpProc *lwpInitSystem(int prio, char **ctxp, int flags);
|
||||
struct lwpProc *lwpCreate(int prio, void (*)(void *), int size,
|
||||
int flags, char *name, char *desc,
|
||||
int argc, char **argv, void *ud);
|
||||
void lwpExit(void);
|
||||
void lwpTerminate(struct lwpProc * p);
|
||||
void lwpYield(void);
|
||||
void lwpSleepFd(int fd, int flags);
|
||||
void lwpSleepUntil(long until);
|
||||
void lwpWakeupFd(struct lwpProc * p);
|
||||
void *lwpGetUD(struct lwpProc * p);
|
||||
void lwpSetUD(struct lwpProc * p, char *ud);
|
||||
void lwpSetDesc(struct lwpProc * p, char *name, char *desc);
|
||||
int lwpSetPriority(int prio);
|
||||
void lwpReschedule(void);
|
||||
|
||||
struct lwpSem *lwpCreateSem _PROTO((char *name, int count));
|
||||
void lwpSignal _PROTO((struct lwpSem *));
|
||||
void lwpWait _PROTO((struct lwpSem *));
|
||||
void lwpSelect _PROTO((int argc, char **argv));
|
||||
void lwpStatus _PROTO((struct lwpProc * proc, char *format, ...));
|
||||
struct lwpSem *lwpCreateSem(char *name, int count);
|
||||
void lwpSignal(struct lwpSem *);
|
||||
void lwpWait(struct lwpSem *);
|
||||
void lwpSelect(void *);
|
||||
void lwpStatus(struct lwpProc * proc, char *format, ...);
|
||||
|
||||
extern struct lwpProc *LwpCurrent;
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ typedef unsigned int u_int;
|
|||
/*#define _POSIX_ */
|
||||
#endif
|
||||
|
||||
#include "prototype.h"
|
||||
#include "options.h"
|
||||
|
||||
/* This is the structure we use to keep track of the global mobility
|
||||
|
|
@ -115,7 +114,6 @@ typedef short coord; /* also change NSC_COORD in nsc.h */
|
|||
#define hours(x) (60*60*(x))
|
||||
#define days(x) (60*60*24*(x))
|
||||
|
||||
typedef void (*voidfunc) ();
|
||||
typedef int (*qsort_func_t) (const void *, const void *);
|
||||
|
||||
/* return codes from command routines */
|
||||
|
|
@ -124,70 +122,18 @@ typedef int (*qsort_func_t) (const void *, const void *);
|
|||
#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 */
|
||||
double dmax(double n1, double n2);
|
||||
double dmin(double n1, double n2);
|
||||
|
||||
/*
|
||||
* references to library functions which aren't related to any
|
||||
* particular object, and are of general interest
|
||||
*/
|
||||
#if !defined(ALPHA) && !defined(__osf__) && !defined(__linux__) && !defined(_WIN32)
|
||||
extern long random();
|
||||
#endif
|
||||
|
||||
double dmax _PROTO((double n1, double n2));
|
||||
double dmin _PROTO((double n1, double n2));
|
||||
|
||||
extern s_char *numstr _PROTO((s_char buf[], int n));
|
||||
extern s_char *esplur _PROTO((int n));
|
||||
extern s_char *splur _PROTO((int n));
|
||||
extern s_char *iesplur _PROTO((int n));
|
||||
extern s_char *plur _PROTO((int n, s_char *no, s_char *yes));
|
||||
extern s_char *getstarg
|
||||
_PROTO((s_char *input, s_char *prompt, s_char buf[]));
|
||||
extern s_char *getstring _PROTO((s_char *prompt, s_char buf[]));
|
||||
extern s_char *numstr(s_char buf[], int n);
|
||||
extern s_char *esplur(int n);
|
||||
extern s_char *splur(int n);
|
||||
extern s_char *iesplur(int n);
|
||||
extern s_char *plur(int n, s_char *no, s_char *yes);
|
||||
extern s_char *getstarg(s_char *input, s_char *prompt, s_char buf[]);
|
||||
extern s_char *getstring(s_char *prompt, s_char buf[]);
|
||||
extern s_char *prbuf(s_char *format, ...);
|
||||
|
||||
/*
|
||||
* frequently used libc functions
|
||||
*/
|
||||
|
||||
#if !defined(_WIN32)
|
||||
#if defined(linux)
|
||||
#ifndef __STDC__
|
||||
extern char *malloc();
|
||||
extern char *calloc();
|
||||
#endif
|
||||
#else
|
||||
#if !defined(ALPHA) && !defined(__osf__) && !defined(ultrix) && !defined(hpux) && !defined(FBSD)
|
||||
extern char *malloc();
|
||||
extern char *calloc();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if (!defined (aix) && !defined (sgi))
|
||||
extern char *ctime();
|
||||
extern char *strncpy();
|
||||
extern char *strcpy();
|
||||
#endif /* !aix && !sgi */
|
||||
|
||||
extern time_t time();
|
||||
#if !defined(_WIN32)
|
||||
#ifdef linux
|
||||
#ifndef atof
|
||||
extern double atof();
|
||||
#endif
|
||||
#else
|
||||
extern double atof();
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if !defined(_WIN32)
|
||||
#if !defined (__ppc__) && !defined (hpux) && !defined (aix) && !defined (linux) && !defined(ALPHA) && !defined(__osf__) && !defined(SUN4) && !defined (Rel4) && !(defined (ultrix) && (defined (__STDC__) || defined (__SYSTEMFIVE) || defined (__POSIX)))
|
||||
extern char *sprintf();
|
||||
#endif /* aix */
|
||||
#endif
|
||||
|
||||
#define MAXCHRNV 12
|
||||
|
||||
#include "prototypes.h" /* must come at end, after defines and typedefs */
|
||||
|
|
|
|||
|
|
@ -191,7 +191,6 @@ extern void putrel(struct natstr *np, natid them, int relate);
|
|||
extern void putreject(struct natstr *np, natid them, int how, int what);
|
||||
extern void putcontact(struct natstr *np, natid them, int contact);
|
||||
extern void agecontact(struct natstr *np);
|
||||
extern struct fixnat *natfield();
|
||||
|
||||
#define NF_INFORM bit(0) /* Inform me of telegrams right away */
|
||||
#define NF_FLASH bit(1) /* Allow other players to flash me (sicko :) */
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#ifndef _NSC_H_
|
||||
#define _NSC_H_
|
||||
|
||||
#include "prototype.h"
|
||||
#include "xy.h"
|
||||
|
||||
#define NS_LSIZE 128
|
||||
|
|
@ -55,7 +54,7 @@ struct nstr_sect {
|
|||
struct range range; /* area of coverage */
|
||||
int dist; /* dist query: range */
|
||||
coord cx, cy; /* dist query: center x-y */
|
||||
int (*read) (); /* read function */
|
||||
int (*read)(int type, int id, caddr_t ptr); /* read function */
|
||||
int ncond; /* # of selection conditions */
|
||||
struct nscstr cond[NS_NCOND]; /* selection conditions */
|
||||
};
|
||||
|
|
@ -72,7 +71,7 @@ struct nstr_item {
|
|||
int size; /* NS_LIST: size of list */
|
||||
int index; /* NS_LIST: index */
|
||||
int list[NS_LSIZE]; /* NS_LIST: item list */
|
||||
int (*read) (); /* read function */
|
||||
int (*read)(int type, int id, caddr_t ptr); /* read function */
|
||||
int flags; /* EFF_ flags */
|
||||
int ncond; /* # of selection conditions */
|
||||
struct nscstr cond[NS_NCOND]; /* selection conditions */
|
||||
|
|
@ -161,6 +160,6 @@ extern s_char *nstr_comp(struct nscstr *, int *, int, s_char *);
|
|||
extern int encode(register s_char *, long *, int);
|
||||
|
||||
|
||||
extern s_char *decodep _PROTO((register long code, register void *addr));
|
||||
extern s_char *decodep(register long code, register void *addr);
|
||||
|
||||
#endif /* _NSC_H_ */
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@
|
|||
#ifndef _OPTLIST_H_
|
||||
#define _OPTLIST_H_
|
||||
|
||||
#include "prototype.h"
|
||||
|
||||
struct option_list {
|
||||
char *opt_key;
|
||||
int *opt_valuep;
|
||||
|
|
@ -44,8 +42,8 @@ struct option_list {
|
|||
|
||||
extern struct option_list Options[];
|
||||
|
||||
extern void set_option _PROTO((const char *key));
|
||||
extern void delete_option _PROTO((const char *key));
|
||||
extern void set_option(const char *key);
|
||||
extern void delete_option(const char *key);
|
||||
|
||||
extern int WORLD_X;
|
||||
extern int WORLD_Y;
|
||||
|
|
@ -104,7 +102,7 @@ extern int opt_ROLLOVER_AVAIL;
|
|||
struct keymatch; /* forward decl */
|
||||
|
||||
/* function prototype for variable setting routines */
|
||||
typedef void KmFunc _PROTO((struct keymatch * kp, s_char **av));
|
||||
typedef void KmFunc(struct keymatch * kp, s_char **av);
|
||||
|
||||
/* current known routines */
|
||||
#if defined(__cplusplus) || (defined(__STDC__) &&__STDC__)
|
||||
|
|
|
|||
|
|
@ -72,10 +72,7 @@ extern int chkpath(natid, s_char *, coord, coord);
|
|||
extern void pathrange(register coord, register coord, register s_char *,
|
||||
int, struct range *);
|
||||
|
||||
extern s_char *masktopath();
|
||||
extern long pathtomask();
|
||||
|
||||
extern double sector_mcost();
|
||||
extern double sector_mcost(struct sctstr *sp, int do_bonus);
|
||||
|
||||
#define P_NONE 0 /* NO destinations allowed */
|
||||
#define P_WALKING 1 /* use BestLandPath, only owned */
|
||||
|
|
|
|||
|
|
@ -165,14 +165,10 @@ struct shiplook {
|
|||
#define PLN_LOAD(b, t) (t ? (b * (logx((double)t, (double)50.0) < 1.0 ? 1.0 : \
|
||||
logx((double)t, (double)50.0))) : b)
|
||||
|
||||
double sqrt();
|
||||
double logx();
|
||||
|
||||
float pln_damage_sect();
|
||||
double logx(double d, double base);
|
||||
|
||||
void count_planes();
|
||||
double sqrt();
|
||||
s_char *prplane();
|
||||
s_char *prplane(struct plnstr *pp);
|
||||
|
||||
|
||||
/* src/lib/subs/aircombat.c */
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
#if !defined(_WIN32)
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
#include "prototype.h"
|
||||
#include "queue.h"
|
||||
#include "misc.h"
|
||||
#include "com.h"
|
||||
|
|
|
|||
|
|
@ -1,44 +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.
|
||||
*
|
||||
* ---
|
||||
*
|
||||
* prototype.h: Various prototype stuff
|
||||
*
|
||||
* Known contributors to this file:
|
||||
*
|
||||
*/
|
||||
|
||||
/* this stuff ought to be somewhere general... */
|
||||
#ifndef _PROTOTYPE_H_
|
||||
#define _PROTOTYPE_H_
|
||||
#if defined(__cplusplus) || (defined(__STDC__) &&__STDC__) || defined(_WIN32)
|
||||
#define _PROTO(x) x
|
||||
#else
|
||||
#define _PROTO(x) ()
|
||||
#define const
|
||||
#define volatile
|
||||
#endif
|
||||
#endif /* _PROTOTYPE_H_ */
|
||||
|
|
@ -58,7 +58,7 @@ extern void shutdwn(int sig);
|
|||
/* src/lib/empthread/lwp.c */
|
||||
#ifdef _EMPTH_LWP
|
||||
extern int empth_init(char **ctx, int flags);
|
||||
extern empth_t *empth_create(int prio, void (*entry) (), int size,
|
||||
extern empth_t *empth_create(int prio, void (*entry)(void *), int size,
|
||||
int flags, char *name, char *desc, void *ud);
|
||||
#if 0
|
||||
extern void empth_setctx(void *ctx);
|
||||
|
|
@ -79,7 +79,7 @@ extern void empth_alarm(int sig);
|
|||
/* src/lib/empthread/pthread.c */
|
||||
#ifdef _EMPTH_POSIX
|
||||
extern int empth_init(char **ctx_ptr, int flags);
|
||||
extern empth_t *empth_create(int prio, void (*entry) (),
|
||||
extern empth_t *empth_create(int prio, void (*entry)(void *),
|
||||
int size, int flags,
|
||||
char *name, char *desc, void *ud);
|
||||
extern empth_t *empth_self(void);
|
||||
|
|
@ -346,9 +346,9 @@ extern s_char *decodep(long, void *);
|
|||
extern int decode(natid, long, void *, int);
|
||||
extern int nstr_exec(struct nscstr *, register int, void *, int);
|
||||
/* path.c */
|
||||
extern void bp_enable_cachepath();
|
||||
extern void bp_disable_cachepath();
|
||||
extern void bp_clear_cachepath();
|
||||
extern void bp_enable_cachepath(void);
|
||||
extern void bp_disable_cachepath(void);
|
||||
extern void bp_clear_cachepath(void);
|
||||
extern s_char *BestDistPath(s_char *, struct sctstr *, struct sctstr *,
|
||||
double *, int);
|
||||
extern s_char *BestLandPath(s_char *, struct sctstr *, struct sctstr *,
|
||||
|
|
@ -856,6 +856,6 @@ extern int feed_ship(struct shpstr *, register int *, int, int *, int);
|
|||
*/
|
||||
/* shutdown.c */
|
||||
extern void shutdown_init(void);
|
||||
extern void shutdown_sequence(int argc, s_char **argv);
|
||||
extern void shutdown_sequence(void *);
|
||||
|
||||
#endif /* _PROTOTYPES_H_ */
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ struct dchrstr {
|
|||
|
||||
/* things relating to sectors */
|
||||
extern int sctoff(coord x, coord y);
|
||||
extern double landgun();
|
||||
extern double landgun(int effic, int guns);
|
||||
|
||||
extern int sct_maxno;
|
||||
extern struct dchrstr dchr[];
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ struct mchrstr {
|
|||
#define getshipp(n) \
|
||||
(struct shpstr *) ef_ptr(EF_SHIP, n)
|
||||
|
||||
extern double seagun();
|
||||
extern double seagun(int effic, int guns);
|
||||
|
||||
extern struct mchrstr mchr[];
|
||||
extern int shp_maxno;
|
||||
|
|
@ -216,8 +216,7 @@ struct mlist {
|
|||
#define SHP_FIR(b, t) (t ? (b * (logx((double)t, (double)60.0) < 1.0 ? 1.0 : \
|
||||
logx((double)t, (double)60.0))) : b)
|
||||
|
||||
double sqrt();
|
||||
double logx();
|
||||
double logx(double d, double base);
|
||||
|
||||
/* return codes from shp_check_nav */
|
||||
#define CN_NAVIGABLE (0)
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
#include "land.h"
|
||||
#include "ship.h"
|
||||
|
||||
#include "prototype.h"
|
||||
|
||||
struct trdstr {
|
||||
short ef_type;
|
||||
natid trd_owner;
|
||||
|
|
@ -76,7 +74,7 @@ union trdgenstr {
|
|||
struct shpstr shp;
|
||||
};
|
||||
|
||||
s_char *trade_nameof _PROTO((struct trdstr * tp, union trdgenstr * tgp));
|
||||
s_char *trade_nameof(struct trdstr * tp, union trdgenstr * tgp);
|
||||
|
||||
#define gettrade(n, p) \
|
||||
ef_read(EF_TRADE, n, (caddr_t)p)
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@ struct range {
|
|||
int height;
|
||||
};
|
||||
|
||||
extern s_char *xyfmt();
|
||||
extern s_char *xyas(coord x, coord y, natid country);
|
||||
extern s_char *ownxy(struct sctstr *sp);
|
||||
extern coord xrel(struct natstr *np, coord absx);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue