From: Anatol Belski <ab@php.net>
Date: Thu, 13 Sep 2018 17:26:49 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.3.0RC2~28^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83685b52588ed62217abc07dec6b048ba580f137;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync version for vc++ 15.9
---

83685b52588ed62217abc07dec6b048ba580f137
diff --cc win32/build/confutils.js
index 1fdc19578a,12e89ca8c7..59f51f249e
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@@ -75,8 -75,15 +75,9 @@@ VC_VERSIONS[1912] = 'MSVC15 (Visual C+
  VC_VERSIONS[1913] = 'MSVC15 (Visual C++ 2017)';
  VC_VERSIONS[1914] = 'MSVC15 (Visual C++ 2017)';
  VC_VERSIONS[1915] = 'MSVC15 (Visual C++ 2017)';
+ VC_VERSIONS[1916] = 'MSVC15 (Visual C++ 2017)';
  
  var VC_VERSIONS_SHORT = new Array();
 -VC_VERSIONS_SHORT[1200] = 'VC6';
 -VC_VERSIONS_SHORT[1300] = 'VC7';
 -VC_VERSIONS_SHORT[1310] = 'VC7.1';
 -VC_VERSIONS_SHORT[1400] = 'VC8';
 -VC_VERSIONS_SHORT[1500] = 'VC9';
 -VC_VERSIONS_SHORT[1600] = 'VC10';
  VC_VERSIONS_SHORT[1700] = 'VC11';
  VC_VERSIONS_SHORT[1800] = 'VC12';
  VC_VERSIONS_SHORT[1900] = 'VC14';