diff options
| author | Anatol Belski <ab@php.net> | 2018-05-28 17:13:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-05-28 17:13:55 +0200 |
| commit | d5ee654b7113c4123a5f2d4628016d31dbced2d4 (patch) | |
| tree | 36edc329afe53165db26cefdc4ac69496cd6d9a9 /win32/build/confutils.js | |
| parent | 4455899a938167ea8617e71dd5f19e92dcc8ab0c (diff) | |
| parent | 5bf8032112016c2f60149d05d20c8756a6e2664a (diff) | |
| download | php-git-d5ee654b7113c4123a5f2d4628016d31dbced2d4.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Translate correct C++ version with suitable compiler
Fixed bug #76383 (array_map on $GLOBALS returns IS_INDIRECT)
Diffstat (limited to 'win32/build/confutils.js')
| -rw-r--r-- | win32/build/confutils.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 486f5ee147..1c00543bb6 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3137,6 +3137,10 @@ function toolset_setup_common_cflags() } } + if (VCVERS >= 1914) { + /* This is only in effect for CXX sources, __cplusplus is not defined in C sources. */ + ADD_FLAG("CFLAGS", "/Zc:__cplusplus"); + } } else if (CLANG_TOOLSET) { if (X64) { ADD_FLAG('CFLAGS', '-m64'); |