summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-15 21:22:10 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-15 21:22:10 +0100
commita971df849f92e32e18ce475fdb47ad9ea2aa47f3 (patch)
treee68a46e8eb6d80d44b468ffd6f68dff46674e1e7
parent3bece9fee9c02934d3e295b29d253e13d4ef26a7 (diff)
downloadvim-git-a971df849f92e32e18ce475fdb47ad9ea2aa47f3.tar.gz
patch 7.4.1323v7.4.1323
Problem: Do not get warnings when building with MingW. Solution: Remove the -w flag. (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 28d31d612..160fcd9c0 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -414,7 +414,7 @@ WINDRES_CC = $(CC)
#>>>>> end of choices
###########################################################################
-CFLAGS = -Iproto $(DEFINES) -pipe -w -march=$(ARCH) -Wall
+CFLAGS = -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
EXTRA_LIBS =
diff --git a/src/version.c b/src/version.c
index f5da6fcdf..1718b4463 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1323,
+/**/
1322,
/**/
1321,