diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-02-06 22:02:43 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-02-06 22:02:43 +0100 |
| commit | dd08b6a32b639b8c7a11275e04ae0a7ffc43aed0 (patch) | |
| tree | 8e5092658d5ac45ca60c7e783579b7928e674910 | |
| parent | 511ffdd65d48b0597ed10614d161b5e811342058 (diff) | |
| download | vim-git-dd08b6a32b639b8c7a11275e04ae0a7ffc43aed0.tar.gz | |
patch 8.0.1474: Visual C 2017 has multiple MSVCVER numbersv8.0.1474
Problem: Visual C 2017 has multiple MSVCVER numbers.
Solution: Assume the 2017 version if MSVCVER >= 1910. (Leonardo Valeri
Manera, closes #2619)
| -rw-r--r-- | src/Make_mvc.mak | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
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 @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1474, +/**/ 1473, /**/ 1472, |