summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-22 20:42:31 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-22 20:42:31 +0100
commit6c0e984f263fc1eef42c9b34a80eff1bceb8d05b (patch)
treeea8a571a4e479679585113bcde4d67821f5e34ba
parent6135d0d803084f6c2dd8672df1bef4c6e58f9e19 (diff)
patch 7.4.1637v7.4.1637
Problem: Can't build with older MinGW compiler. Solution: Change option from c++11 to gnu++11. (Ken Takata)
-rw-r--r--src/Make_cyg_ming.mak2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 9bb26aa6da..62585e9961 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -415,7 +415,7 @@ WINDRES_CC = $(CC)
###########################################################################
CFLAGS = -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
-CXXFLAGS = -std=c++11
+CXXFLAGS = -std=gnu++11
WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
EXTRA_LIBS =
diff --git a/src/version.c b/src/version.c
index d28ad946a2..c9f1926acf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1637,
+/**/
1636,
/**/
1635,