From f7ec5ba1bbea7563ea9084bb2f67a260f0041d65 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh@wizmail.org>
Date: Mon, 24 Dec 2018 14:47:32 +0000
Subject: [PATCH] Move -stc=c99 to CFLAGS restricted to only 4.next

---
 build-farm.conf.template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/build-farm.conf.template b/build-farm.conf.template
index d2e4292..cb08834 100644
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -169,8 +169,7 @@ our %conf =(
     # LDFLAGS => '-Wall'  will create  LDFLAGS+='-Wall'
     makefile_add =>{
         # Show all warnings and errors
-	# Some platforms need the c99 setting enabled
-        CFLAGS => '-std=c99 -Wall -Wno-parentheses -Werror=format-security',
+        CFLAGS => '-Wall -Wno-parentheses -Werror=format-security',
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',
@@ -252,4 +251,11 @@ if ($branch eq 'global')
 #	$conf{makefile_set}{SUPPORT_DANE} = '';
 #}
 
+# Some platforms need the c99 setting enabled for 4.next, which starts using more c99 syntax
+if ($branch eq '4.next')
+{
+        $conf{makefile_add}{CFLAGS} .= ' -std=c99';
+}
+
+
 1;
-- 
2.30.2