From 1ec7a68b0741eff1c2e41791b58b8fbeef1f3eb4 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 2 Mar 2015 23:12:02 +0100
Subject: [PATCH] fix terrible code to avoid gcc 4.9 warning

---
 src/kernel/region.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/kernel/region.c b/src/kernel/region.c
index 7f5d65ef6..807fb3d76 100644
--- a/src/kernel/region.c
+++ b/src/kernel/region.c
@@ -611,8 +611,8 @@ int rpeasants(const region * r)
 
 void rsetpeasants(region * r, int value)
 {
-    ((r)->land ? ((r)->land->peasants =
-        (value)) : (assert((value) >= 0), (value)), 0);
+    if (r->land) r->land->peasants = value;
+    else assert(value>=0);
 }
 
 int rmoney(const region * r)
@@ -634,8 +634,8 @@ int rhorses(const region * r)
 
 void rsetmoney(region * r, int value)
 {
-    ((r)->land ? ((r)->land->money =
-        (value)) : (assert((value) >= 0), (value)), 0);
+    if (r->land) r->land->money = value;
+    else assert(value >= 0);
 }
 
 void r_setdemand(region * r, const luxury_type * ltype, int value)