changeset 20403:eba6981e3c9c v8.2.0756

patch 8.2.0756: MS-Windows: still a compiler warning Commit: https://github.com/vim/vim/commit/7e6f3fcc3ce89fc8ade85be39aa475e606c0b26c Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 15 18:21:51 2020 +0200 patch 8.2.0756: MS-Windows: still a compiler warning Problem: MS-Windows: still a compiler warning. Solution: Move flag to another place in the Makefile. (Ken Takata, closes #6083)
author Bram Moolenaar <Bram@vim.org>
date Fri, 15 May 2020 18:30:05 +0200
parents ad9971ac44ca
children fe0c8c13d273
files src/Make_mvc.mak src/version.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -675,9 +675,6 @@ CFLAGS = $(CFLAGS) $(WP64CHECK)
 
 CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
 RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
-! if "$(CL)" == "/D_USING_V110_SDK71_"
-RCFLAGS = $(RCFLAGS) /D_USING_V110_SDK71_
-! endif
 ! ifdef USE_MSVCRT
 CFLAGS = $(CFLAGS) /MD
 LIBC = msvcrt.lib
@@ -707,6 +704,10 @@ CFLAGS = $(CFLAGS) /Zl /MTd
 ! endif
 !endif # DEBUG
 
+!if "$(CL)" == "/D_USING_V110_SDK71_"
+RCFLAGS = $(RCFLAGS) /D_USING_V110_SDK71_
+!endif
+
 !if $(MSVC_MAJOR) >= 8
 # Visual Studio 2005 has 'deprecated' many of the standard CRT functions
 CFLAGS_DEPR = /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    756,
+/**/
     755,
 /**/
     754,