Skip to content

Commit dd08b6a

Browse files
committed
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)
1 parent 511ffdd commit dd08b6a

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

src/Make_mvc.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ MSVC_MAJOR = ($(MSVCVER) / 100 - 6)
289289
MSVCRT_VER = ($(MSVCVER) / 10 - 60)
290290
# Visual C++ 2017 needs special handling
291291
# it has an _MSC_VER of 1910->14.1, but is actually v15 with runtime v140
292-
!elseif $(MSVCVER) == 1910
292+
# TODO: what's the maximum value?
293+
!elseif $(MSVCVER) >= 1910
293294
MSVC_MAJOR = 15
294295
MSVCRT_VER = 140
295296
!else

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ static char *(features[]) =
771771

772772
static int included_patches[] =
773773
{ /* Add new patch number below this line */
774+
/**/
775+
1474,
774776
/**/
775777
1473,
776778
/**/

0 commit comments

Comments
 (0)