From cdedd0ef5985ac408bcce30408dd855750a2dfc2 Mon Sep 17 00:00:00 2001
From: backwardsEric
Date: Wed, 11 Sep 2019 14:24:25 -0700
Subject: [PATCH] To avoid unused expression warnings from version 10.0.1 of
 Apple's cc when compiling the English version, moved format() into the _()
 macro in three places.

---
 src/monster1.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/monster1.c b/src/monster1.c
index a3950a4c..a42819fc 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -366,17 +366,17 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 			/* But we've also killed it */
 			if (dead)
 			{
-				hooked_roff(format(
-					_("が、すでに仇討ちは果たしている！", 
-					 (", but you have avenged %s!  ", plural(r_ptr->r_deaths, "him", "them")))));
+				hooked_roff(
+				        _(format("が、すでに仇討ちは果たしている！"), 
+				          format(", but you have avenged %s!  ", plural(r_ptr->r_deaths, "him", "them"))));
 			}
 
 			/* Unavenged (ever) */
 			else
 			{
-				hooked_roff(format(
-					_("のに、まだ仇討ちを果たしていない。", 
-					 (", who %s unavenged.  ", plural(r_ptr->r_deaths, "remains", "remain")))));
+				hooked_roff(
+				        _(format("のに、まだ仇討ちを果たしていない。"), 
+					  format(", who %s unavenged.  ", plural(r_ptr->r_deaths, "remains", "remain"))));
 			}
 
 			/* Start a new line */
@@ -1547,9 +1547,9 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 		{
 			hooked_roff(format(_("%^sは経験を積むと、", "%^s will evolve into "), wd_he[msex]));
 			hook_c_roff(TERM_YELLOW, format("%s", r_name+r_info[r_ptr->next_r_idx].name));
-			hooked_roff(format(
-				_(("に進化する。"), 
-				  (" when %s gets enough experience.  ", wd_he[msex]))));
+			hooked_roff(
+				_(format("に進化する。"), 
+				  format(" when %s gets enough experience.  ", wd_he[msex])));
 		}
 		else if (!(r_ptr->flags1 & RF1_UNIQUE))
 		{
-- 
2.20.1 (Apple Git-117)