From bd9592cb1f200f9463fb56261e85b6baf6783662 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Sun, 12 Nov 2017 13:42:25 +0100
Subject: [PATCH] Fix two warnings when using gcc < 7

---
 rtengine/cJSON.c        | 4 ++--
 rtengine/iptransform.cc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rtengine/cJSON.c b/rtengine/cJSON.c
index bf46c98c4..8e9cdcccf 100644
--- a/rtengine/cJSON.c
+++ b/rtengine/cJSON.c
@@ -191,7 +191,7 @@ static const char *parse_string(cJSON *item,const char *str)
 
 					len=4;if (uc<0x80) len=1;else if (uc<0x800) len=2;else if (uc<0x10000) len=3; ptr2+=len;
 					
-#ifdef __GNUC__ // silence warning
+#if defined( __GNUC__ ) && __GNUC__ >= 7// silence warning
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #endif
@@ -203,7 +203,7 @@ static const char *parse_string(cJSON *item,const char *str)
 						case 1: *--ptr2 =(uc | firstByteMark[len]);
 					}
 
-#ifdef __GNUC__
+#if defined( __GNUC__ ) && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif
 					ptr2+=len;
diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc
index bfdf484d3..d73dc8ac0 100644
--- a/rtengine/iptransform.cc
+++ b/rtengine/iptransform.cc
@@ -788,7 +788,7 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
     bool enableLCPDist = false;
     bool enableCA = false;
 
-#ifdef __GNUC__ // silence warning
+#if defined( __GNUC__ ) && __GNUC__ >= 7// silence warning
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #endif
@@ -810,7 +810,7 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
             break;
         }
     }
-#ifdef __GNUC__
+#if defined( __GNUC__ ) && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif