From b6f37945607c69072242626d5dc62a95eed75a57 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar@fedoraproject.org>
Date: Wed, 7 Feb 2018 20:46:38 +0100
Subject: [PATCH 2/2] Fix compilation with GCC 7: never compare pointers to
 boolean ...

---
 src/MapRenderer.cpp           | 2 +-
 src/gui/stack-army-button.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MapRenderer.cpp b/src/MapRenderer.cpp
index 53aa278..03356fb 100644
--- a/src/MapRenderer.cpp
+++ b/src/MapRenderer.cpp
@@ -72,7 +72,7 @@ void MapRenderer::render_tile(Vector<int> draw, Vector<int> tile,
     }
   else
     {
-      if (style->getImage() == false)
+      if (style->getImage() == NULL)
 	{
 	  printf ("pic for style %d for tile %d at %d,%d is null\n",
 		  style->getType(), mtile->getType(), tile.x, tile.y);
diff --git a/src/gui/stack-army-button.cpp b/src/gui/stack-army-button.cpp
index 351d978..dcfe4c1 100644
--- a/src/gui/stack-army-button.cpp
+++ b/src/gui/stack-army-button.cpp
@@ -146,7 +146,7 @@ void StackArmyButton::fill_army_button()
     {
       bool greyed_out = false;
       Stack *active_stack = p->getActivestack();
-      if (active_stack->getArmyById(d_army->getId()) == false)
+      if (active_stack->getArmyById(d_army->getId()) == NULL)
         greyed_out = true;
       army_image->property_pixbuf() =
         gc->getCircledArmyPic(p->getArmyset(), d_army->getTypeId(),
-- 
2.14.3