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 c2e808c954adbe5abaa7e3131b20daaa2b53fdbd..65da331b7308fd5ad2c40e948c4fd43c626af81d 100644 (file)
--- 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 8f3430399981bd7a47f899dcdac13169cf0547d7..350c83067891bb9a52bd03c2f6fa7b491017a67c 100644 (file)
--- 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,
 /**/