diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-02-25 22:04:55 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-02-25 22:04:55 +0100 |
commit | 703ea9eaefd3628d75c8c2fa19f934f6832638f1 (patch) | |
tree | 475871633cd4e9c5033149a1b639b6797146ce0b | |
parent | 8d588ccee57390aa01c2395fc599bbe6506ee13a (diff) |
patch 8.2.0317: MSVC: _CRT_SECURE_NO_DEPRECATE not defined on DEBUG buildv8.2.0317
Problem: MSVC: _CRT_SECURE_NO_DEPRECATE not defined on DEBUG build.
Solution: Move where CFLAGS is updated. (Ken Takata, closes #5692)
-rw-r--r-- | src/Make_mvc.mak | 9 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 6076dc172e..5be53cf6ad 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -663,9 +663,6 @@ OPTFLAG = /Ox ! if "$(OPTIMIZE)" != "SPACE" OPTFLAG = $(OPTFLAG) /GL ! endif -# Visual Studio 2005 has 'deprecated' many of the standard CRT functions -CFLAGS_DEPR = /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE -CFLAGS = $(CFLAGS) $(CFLAGS_DEPR) ! endif # (/Wp64 is deprecated in VC9 and generates an obnoxious warning.) @@ -707,6 +704,12 @@ CFLAGS = $(CFLAGS) /Zl /MTd ! endif !endif # DEBUG +!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 +CFLAGS = $(CFLAGS) $(CFLAGS_DEPR) +!endif + !include Make_all.mak !include testdir\Make_all.mak diff --git a/src/version.c b/src/version.c index f10dcd55d2..5d76c5ee82 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 317, +/**/ 316, /**/ 315, |