From 703ea9eaefd3628d75c8c2fa19f934f6832638f1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 25 Feb 2020 22:04:55 +0100
Subject: [PATCH] patch 8.2.0317: MSVC: _CRT_SECURE_NO_DEPRECATE not defined on
 DEBUG build

Problem:    MSVC: _CRT_SECURE_NO_DEPRECATE not defined on DEBUG build.
Solution:   Move where CFLAGS is updated. (Ken Takata, closes #5692)
---
 src/Make_mvc.mak | 9 ++++++---
 src/version.c    | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 6076dc172..5be53cf6a 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 f10dcd55d..5d76c5ee8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    317,
 /**/
     316,
 /**/
-- 
2.50.1