From 2bc127f94016801250f8f24234f90a5182d77e73 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 10 Jul 2016 13:57:40 +0200 Subject: [PATCH] patch 7.4.2016 Problem: Warning from MinGW about _WIN32_WINNT redefined. (John Marriott) Solution: First undefine it. (Ken Takata) --- src/Make_cyg_ming.mak | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 005df196a..e0638abb9 100644 --- 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 b2dc76ec3..cce37b19f 100644 --- 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, /**/ -- 2.50.1