diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-10 13:57:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-10 13:57:40 +0200 |
| commit | 2bc127f94016801250f8f24234f90a5182d77e73 (patch) | |
| tree | 35b112cca0a5edace5fa5953e5ed2ab906b19d2a | |
| parent | 5c71994f4ee5f87d4cce990dbc9684c70b1e108b (diff) | |
| download | vim-git-2bc127f94016801250f8f24234f90a5182d77e73.tar.gz | |
patch 7.4.2016v7.4.2016
Problem: Warning from MinGW about _WIN32_WINNT redefined. (John Marriott)
Solution: First undefine it. (Ken Takata)
| -rw-r--r-- | src/Make_cyg_ming.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2016, +/**/ 2015, /**/ 2014, |