diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-15 18:21:51 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-15 18:21:51 +0200 |
| commit | 7e6f3fcc3ce89fc8ade85be39aa475e606c0b26c (patch) | |
| tree | 52fdee4f0bdaeb32372560d22bc57baa6a444264 | |
| parent | 227a69de1e0f9457a9fc9e098d999304faff55f8 (diff) | |
patch 8.2.0756: MS-Windows: still a compiler warningv8.2.0756
Problem: MS-Windows: still a compiler warning.
Solution: Move flag to another place in the Makefile. (Ken Takata,
closes #6083)
| -rw-r--r-- | src/Make_mvc.mak | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index ffe6e4914c..c93517b980 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 1f77ddc3f7..44f816aef3 100644 --- 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, |