# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1468152006 -7200
# Node ID 2f2b96276941b63f4d611688b6d851d995492d6d
# Parent  9347c93502916954a48dbfe72e23e3686b68caa3
commit https://github.com/vim/vim/commit/2bc127f94016801250f8f24234f90a5182d77e73
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jul 10 13:57:40 2016 +0200

    patch 7.4.2016
    Problem:    Warning from MinGW about _WIN32_WINNT redefined. (John Marriott)
    Solution:   First undefine it. (Ken Takata)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -893,7 +893,7 @@ if_perl.c: if_perl.xs typemap
 	     $(PERLTYPEMAP) if_perl.xs > $@
 
 $(OUTDIR)/iscygpty.o:	iscygpty.c $(CUI_INCL)
-	$(CC) -c $(CFLAGS) iscygpty.c -o $(OUTDIR)/iscygpty.o -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL
+	$(CC) -c $(CFLAGS) iscygpty.c -o $(OUTDIR)/iscygpty.o -U_WIN32_WINNT -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL
 
 $(OUTDIR)/main.o:		main.c $(INCL) $(CUI_INCL)
 	$(CC) -c $(CFLAGS) main.c -o $(OUTDIR)/main.o
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2016,
+/**/
     2015,
 /**/
     2014,