From dccc0d1349741807b8f831feef0e6067a9e987cb Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 20 Jan 2007 19:16:09 +0000 Subject: [PATCH] (getlandp, getloanp, getnatp, getnewsp, getnukep, getplanep) (getpowerp, getshipp, gettradep, gettrep): Fix insufficiently parenthesized macro expansion. --- include/land.h | 2 +- include/loan.h | 2 +- include/nat.h | 2 +- include/news.h | 2 +- include/nuke.h | 2 +- include/plane.h | 2 +- include/power.h | 2 +- include/ship.h | 2 +- include/trade.h | 2 +- include/treaty.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/land.h b/include/land.h index 357cea1ee..0f7992a3e 100644 --- a/include/land.h +++ b/include/land.h @@ -175,7 +175,7 @@ struct lchrstr { #define getland(n, p) ef_read(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]; diff --git a/include/loan.h b/include/loan.h index 1051febfa..317118868 100644 --- a/include/loan.h +++ b/include/loan.h @@ -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 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 diff --git a/include/nat.h b/include/nat.h index 13069c407..be31d2f09 100644 --- a/include/nat.h +++ b/include/nat.h @@ -161,7 +161,7 @@ extern char *relates[]; /* procedures relating to nation stuff */ #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 putrealm(p) ef_write(EF_REALM, (p)->r_uid, (p)) diff --git a/include/news.h b/include/news.h index fd27ae363..4a0e5efa4 100644 --- a/include/news.h +++ b/include/news.h @@ -163,7 +163,7 @@ struct rptstr { #define getnews(n, p) ef_read(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 symbol page_headings[N_MAX_PAGE + 2]; diff --git a/include/nuke.h b/include/nuke.h index 142d7460c..819d18c2d 100644 --- a/include/nuke.h +++ b/include/nuke.h @@ -81,7 +81,7 @@ struct nchrstr { #define getnuke(n, p) ef_read(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 */ #define NUK_BLD_WORK(lcm, hcm, oil, rad) \ diff --git a/include/plane.h b/include/plane.h index aba9efb1f..4daf06f81 100644 --- a/include/plane.h +++ b/include/plane.h @@ -137,7 +137,7 @@ struct plist { #define getplane(n, p) ef_read(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]; diff --git a/include/power.h b/include/power.h index 6ec24928e..adffa0cbe 100644 --- a/include/power.h +++ b/include/power.h @@ -59,6 +59,6 @@ struct powstr { #define getpower(n, p) ef_read(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 diff --git a/include/ship.h b/include/ship.h index 3042e0d60..44bbc02eb 100644 --- a/include/ship.h +++ b/include/ship.h @@ -181,7 +181,7 @@ struct mchrstr { #define getship(n, p) ef_read(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]; diff --git a/include/trade.h b/include/trade.h index f8cdca299..fedb5307e 100644 --- a/include/trade.h +++ b/include/trade.h @@ -61,6 +61,6 @@ extern int trade_getitem(struct trdstr *, union empobj_storage *); #define gettrade(n, p) ef_read(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 diff --git a/include/treaty.h b/include/treaty.h index 8a0cadc83..bbdf719f8 100644 --- a/include/treaty.h +++ b/include/treaty.h @@ -69,6 +69,6 @@ struct trtstr { #define gettre(n, p) ef_read(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 -- 2.43.0