From: Anatol Belski <ab@php.net>
Date: Sun, 14 Jan 2018 15:42:17 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.2RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be0620a2f03663f7917891eea9c1dfcf530dd9db;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync for upcoming vc++ 15.6 version raise
---

be0620a2f03663f7917891eea9c1dfcf530dd9db
diff --cc win32/build/confutils.js
index 59991797bc,a75546c86c..1c463877cb
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@@ -72,8 -72,15 +72,9 @@@ VC_VERSIONS[1900] = 'MSVC14 (Visual C+
  VC_VERSIONS[1910] = 'MSVC15 (Visual C++ 2017)';
  VC_VERSIONS[1911] = 'MSVC15 (Visual C++ 2017)';
  VC_VERSIONS[1912] = 'MSVC15 (Visual C++ 2017)';
+ VC_VERSIONS[1913] = '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';