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

(getlandp, getloanp, getnatp, getnewsp, getnukep, getplanep)

Browse source 
(getpowerp, getshipp, gettradep, gettrep): Fix insufficiently
parenthesized macro expansion.
This commit is contained in:
Markus Armbruster 2007-01-20 19:16:09 +00:00
parent eae63fb950
commit dccc0d1349
10 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/land.h
View file

@ -175,7 +175,7 @@ struct lchrstr {
#define getland(n, p) ef_read(EF_LAND, (n), (p)) #define getland(n, p) ef_read(EF_LAND, (n), (p))
#define putland(n, p) ef_write(EF_LAND, (n), (p)) #define putland(n, p) ef_write(EF_LAND, (n), (p))
#define getlandp(n) (struct lndstr *)ef_ptr(EF_LAND, (n)) #define getlandp(n) ((struct lndstr *)ef_ptr(EF_LAND, (n)))
extern struct lchrstr lchr[LND_TYPE_MAX + 2]; extern struct lchrstr lchr[LND_TYPE_MAX + 2];

2
include/loan.h
View file

@ -63,6 +63,6 @@ extern double loan_owed(struct lonstr *loan, time_t paytime);
#define getloan(n, p) ef_read(EF_LOAN, (n), (p)) #define getloan(n, p) ef_read(EF_LOAN, (n), (p))
#define putloan(n, p) ef_write(EF_LOAN, (n), (p)) #define putloan(n, p) ef_write(EF_LOAN, (n), (p))
#define getloanp(n) (struct lonstr *)ef_ptr(EF_LOAN, (n)) #define getloanp(n) ((struct lonstr *)ef_ptr(EF_LOAN, (n)))
#endif #endif

2
include/nat.h
View file

@ -161,7 +161,7 @@ extern char *relates[];
/* procedures relating to nation stuff */ /* procedures relating to nation stuff */
#define putnat(p) ef_write(EF_NATION, (p)->nat_cnum, (p)) #define putnat(p) ef_write(EF_NATION, (p)->nat_cnum, (p))
#define getnatp(n) (struct natstr *)ef_ptr(EF_NATION, (n)) #define getnatp(n) ((struct natstr *)ef_ptr(EF_NATION, (n)))
#define getrealm(r, n, p) ef_read(EF_REALM, ((r) + ((n) * MAXNOR)), (p)) #define getrealm(r, n, p) ef_read(EF_REALM, ((r) + ((n) * MAXNOR)), (p))
#define putrealm(p) ef_write(EF_REALM, (p)->r_uid, (p)) #define putrealm(p) ef_write(EF_REALM, (p)->r_uid, (p))

2
include/news.h
View file

@ -163,7 +163,7 @@ struct rptstr {
#define getnews(n, p) ef_read(EF_NEWS, (n), (p)) #define getnews(n, p) ef_read(EF_NEWS, (n), (p))
#define putnews(n, p) ef_write(EF_NEWS, (n), (p)) #define putnews(n, p) ef_write(EF_NEWS, (n), (p))
#define getnewsp(n) (struct nwsstr *)ef_ptr(EF_NEWS, (n)) #define getnewsp(n) ((struct nwsstr *)ef_ptr(EF_NEWS, (n)))
extern struct rptstr rpt[N_MAX_VERB + 2]; extern struct rptstr rpt[N_MAX_VERB + 2];
extern struct symbol page_headings[N_MAX_PAGE + 2]; extern struct symbol page_headings[N_MAX_PAGE + 2];

2
include/nuke.h
View file

@ -81,7 +81,7 @@ struct nchrstr {
#define getnuke(n, p) ef_read(EF_NUKE, (n), (p)) #define getnuke(n, p) ef_read(EF_NUKE, (n), (p))
#define putnuke(n, p) ef_write(EF_NUKE, (n), (p)) #define putnuke(n, p) ef_write(EF_NUKE, (n), (p))
#define getnukep(n) (struct nukstr *)ef_ptr(EF_NUKE, (n)) #define getnukep(n) ((struct nukstr *)ef_ptr(EF_NUKE, (n)))
/* Work required for building */ /* Work required for building */
#define NUK_BLD_WORK(lcm, hcm, oil, rad) \ #define NUK_BLD_WORK(lcm, hcm, oil, rad) \

2
include/plane.h
View file

@ -137,7 +137,7 @@ struct plist {
#define getplane(n, p) ef_read(EF_PLANE, (n), (p)) #define getplane(n, p) ef_read(EF_PLANE, (n), (p))
#define putplane(n, p) ef_write(EF_PLANE, (n), (p)) #define putplane(n, p) ef_write(EF_PLANE, (n), (p))
#define getplanep(n) (struct plnstr *)ef_ptr(EF_PLANE, (n)) #define getplanep(n) ((struct plnstr *)ef_ptr(EF_PLANE, (n)))
extern struct plchrstr plchr[PLN_TYPE_MAX + 2]; extern struct plchrstr plchr[PLN_TYPE_MAX + 2];

2
include/power.h
View file

@ -59,6 +59,6 @@ struct powstr {
#define getpower(n, p) ef_read(EF_POWER, (n), (p)) #define getpower(n, p) ef_read(EF_POWER, (n), (p))
#define putpower(n, p) ef_write(EF_POWER, (n), (p)) #define putpower(n, p) ef_write(EF_POWER, (n), (p))
#define getpowerp(n) (struct powstr *)ef_ptr(EF_POWER, (n)) #define getpowerp(n) ((struct powstr *)ef_ptr(EF_POWER, (n)))
#endif #endif

2
include/ship.h
View file

@ -181,7 +181,7 @@ struct mchrstr {
#define getship(n, p) ef_read(EF_SHIP, (n), (p)) #define getship(n, p) ef_read(EF_SHIP, (n), (p))
#define putship(n, p) ef_write(EF_SHIP, (n), (p)) #define putship(n, p) ef_write(EF_SHIP, (n), (p))
#define getshipp(n) (struct shpstr *)ef_ptr(EF_SHIP, (n)) #define getshipp(n) ((struct shpstr *)ef_ptr(EF_SHIP, (n)))
extern struct mchrstr mchr[SHP_TYPE_MAX + 2]; extern struct mchrstr mchr[SHP_TYPE_MAX + 2];

2
include/trade.h
View file

@ -61,6 +61,6 @@ extern int trade_getitem(struct trdstr *, union empobj_storage *);
#define gettrade(n, p) ef_read(EF_TRADE, (n), (p)) #define gettrade(n, p) ef_read(EF_TRADE, (n), (p))
#define puttrade(n, p) ef_write(EF_TRADE, (n), (p)) #define puttrade(n, p) ef_write(EF_TRADE, (n), (p))
#define gettradep(n) (struct trdstr *)ef_ptr(EF_TRADE, (n)) #define gettradep(n) ((struct trdstr *)ef_ptr(EF_TRADE, (n)))
#endif #endif

2
include/treaty.h
View file

@ -69,6 +69,6 @@ struct trtstr {
#define gettre(n, p) ef_read(EF_TREATY, (n), (p)) #define gettre(n, p) ef_read(EF_TREATY, (n), (p))
#define puttre(n, p) ef_write(EF_TREATY, (n), (p)) #define puttre(n, p) ef_write(EF_TREATY, (n), (p))
#define gettrep(n) (struct trtstr *)ef_ptr(EF_TREATY, (n)) #define gettrep(n) ((struct trtstr *)ef_ptr(EF_TREATY, (n)))
#endif #endif