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

(getpowerp, getshipp, gettradep, gettrep): Fix insufficiently
parenthesized macro expansion.

diff --git a/include/land.h b/include/land.h
index 357cea1eeaba323ec923e19c1da21f87591b4cf8..0f7992a3e2952454626c9ea549e275de358b2cf2 100644 (file)
--- 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 1051febfa17f010b3ad368539281c319a952da2e..317118868ad823a221b49f1417120bf6ed2548f2 100644 (file)
--- 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 13069c407849041d7cd69cc7c02a8320819b9709..be31d2f0976fd101cb7069298798bc16d549d473 100644 (file)
--- 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 fd27ae363193612b3d2863cf89d8dd730e42dafe..4a0e5efa4d2ad9662d5440e52586eeb579eeec71 100644 (file)
--- 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 142d7460cf712d62c1dd4fd107621bd32fea0adf..819d18c2d8546c616e6b17d389d7ba87952c313e 100644 (file)
--- 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 aba9efb1f88bf8524672e87a4acf4880de06a340..4daf06f8140e7139ca6671f40188c20791b32ef2 100644 (file)
--- 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 6ec24928e23848d2bf67de82abbdfdab35f305da..adffa0cbe45190bb7f40fa308415f1b3a0cef878 100644 (file)
--- 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 3042e0d602901d56786565bdf6aa89abd7048c84..44bbc02eb42b05487319482c01d93ef37b039d46 100644 (file)
--- 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 f8cdca299acb2263346bc32e23a4cb9360970900..fedb5307ebaf4c989cf5e531e8f83f500d9e5312 100644 (file)
--- 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 8a0cadc839f516b3e5a957998aa9471365bf1ede..bbdf719f8f22ca3ae7bd09f2b82a946b7ba29284 100644 (file)
--- 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