From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 6 Feb 2018 21:02:43 +0000 (+0100)
Subject: patch 8.0.1474: Visual C 2017 has multiple MSVCVER numbers
X-Git-Tag: v8.0.1474
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd08b6a32b639b8c7a11275e04ae0a7ffc43aed0;p=vim

patch 8.0.1474: Visual C 2017 has multiple MSVCVER numbers

Problem:    Visual C 2017 has multiple MSVCVER numbers.
Solution:   Assume the 2017 version if MSVCVER >= 1910. (Leonardo Valeri
            Manera, closes #2619)
---

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index c2e808c95..65da331b7 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -289,7 +289,8 @@ MSVC_MAJOR = ($(MSVCVER) / 100 - 6)
 MSVCRT_VER = ($(MSVCVER) / 10 - 60)
 # Visual C++ 2017 needs special handling
 # it has an _MSC_VER of 1910->14.1, but is actually v15 with runtime v140
-!elseif $(MSVCVER) == 1910
+# TODO: what's the maximum value?
+!elseif $(MSVCVER) >= 1910
 MSVC_MAJOR = 15
 MSVCRT_VER = 140
 !else
diff --git a/src/version.c b/src/version.c
index 8f3430399..350c83067 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1474,
 /**/
     1473,
 /**/