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
index 005df196ae94f2dfe4469df4791288a5729c1e58..e0638abb9be69cf6c9f9a09f81c0359fa065bd1f 100644 (file)
--- 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
index b2dc76ec3d22ef2ef9d12495047605cb4fb94956..cce37b19f121833538320703def4970f7e5c66b6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2016,
 /**/
     2015,
 /**/