From 82dbb7dfa46217f4b252717478d0486212e2e3e7 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 7 Mar 2016 09:54:27 +1100
Subject: To avoid failures with MinGW 4.9 switch language standard from c++0x
 to gnu++0x. MinGW 4.9 doesn't install a copy of gcc as cc.exe so explicitly
 set CC=gcc.

---
 gtk/makefile   | 3 ++-
 win32/makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gtk/makefile b/gtk/makefile
index f9086fa34..ca8d7c656 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -37,6 +37,7 @@ PICFLAGS = -fPIC
 endif
 
 ifdef windir
+CC = gcc
 DEL = del /q
 COMPLIB=..\bin\scintilla.a
 else
@@ -74,7 +75,7 @@ CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
 endif
 
 CFLAGS:=$(CTFLAGS)
-CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS)
+CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)
 
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 MARSHALLER=scintilla-marshal.o
diff --git a/win32/makefile b/win32/makefile
index 668812553..05d6f8f70 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -31,7 +31,7 @@ ifneq "$(shell g++ -c CheckD2D.cxx 2>&1)" ""
 D2DFLAGS=-DDISABLE_D2D
 endif
 
-CXXBASEFLAGS=--std=c++0x -Wall -pedantic $(INCLUDEDIRS) $(D2DFLAGS)
+CXXBASEFLAGS=--std=gnu++0x -Wall -pedantic $(INCLUDEDIRS) $(D2DFLAGS)
 
 ifdef CXX11_REGEX
 REFLAGS=-DCXX11_REGEX
-- 
cgit v1.2.3