summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-06-28 13:28:46 +0200
committerAnatol Belski <ab@php.net>2018-06-28 13:28:46 +0200
commite835916f6501c903fbb434ef99745533934dae9d (patch)
treec2cb860a5521de9909598f8319dc2178474566f3
parentb35f45ded2e8f0fb4b796669a7ff7a1843fd4814 (diff)
parent88b5df91f6ba9b4062b6fd0ba5a7497e4b4f6e94 (diff)
downloadphp-git-e835916f6501c903fbb434ef99745533934dae9d.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Sync versions for VC++ 15.8
-rw-r--r--win32/build/confutils.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 1c00543bb6..1fdc19578a 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -74,6 +74,7 @@ VC_VERSIONS[1911] = 'MSVC15 (Visual C++ 2017)';
VC_VERSIONS[1912] = 'MSVC15 (Visual C++ 2017)';
VC_VERSIONS[1913] = 'MSVC15 (Visual C++ 2017)';
VC_VERSIONS[1914] = 'MSVC15 (Visual C++ 2017)';
+VC_VERSIONS[1915] = 'MSVC15 (Visual C++ 2017)';
var VC_VERSIONS_SHORT = new Array();
VC_VERSIONS_SHORT[1700] = 'VC11';
@@ -84,6 +85,7 @@ VC_VERSIONS_SHORT[1911] = 'VC15';
VC_VERSIONS_SHORT[1912] = 'VC15';
VC_VERSIONS_SHORT[1913] = 'VC15';
VC_VERSIONS_SHORT[1914] = 'VC15';
+VC_VERSIONS_SHORT[1915] = 'VC15';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";