# HG changeset patch # User Bram Moolenaar # Date 1589560205 -7200 # Node ID eba6981e3c9c1efd115d4ecf11fc4bf13b1287fa # Parent ad9971ac44ca989eaee22ada8d2cdcfe2ea5d096 patch 8.2.0756: MS-Windows: still a compiler warning Commit: https://github.com/vim/vim/commit/7e6f3fcc3ce89fc8ade85be39aa475e606c0b26c Author: Bram Moolenaar 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) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- 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 --- 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,