From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 15 May 2020 16:21:51 +0000 (+0200)
Subject: patch 8.2.0756: MS-Windows: still a compiler warning
X-Git-Tag: v8.2.0756
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e6f3fcc3ce89fc8ade85be39aa475e606c0b26c;p=vim

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)
---

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index ffe6e4914..c93517b98 100644
--- 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
diff --git a/src/version.c b/src/version.c
index 1f77ddc3f..44f816aef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    756,
 /**/
     755,
 /**/