diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-12 18:00:21 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-12 18:00:21 +0200 |
commit | ab7c3bf4bc1220568c0a0a581aea7e2da6bf0b5b (patch) | |
tree | 156819cd6a696688169a24507a4f4e4135119daf /win32 | |
parent | f0d4c48c7e02469ae36775b0cdd2dbe1a23450e4 (diff) | |
parent | ce646357bf8f58f7fc52c5ce77c5b9a4e5c207fb (diff) | |
download | php-git-ab7c3bf4bc1220568c0a0a581aea7e2da6bf0b5b.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix WS
Diffstat (limited to 'win32')
-rw-r--r-- | win32/winutil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/winutil.c b/win32/winutil.c index 5f4821b2ef..578e66c074 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -457,8 +457,8 @@ static zend_always_inline BOOL is_compatible(const char *name, BOOL is_smaller, /* VS 2015, 2017 and 2019 are binary compatible, but only forward compatible. It should be fine, if we load a module linked with an older one into the core linked with the newer one, but not the otherway round. - Analogously, it should be fine, if a PHP build linked with an older version - is used with a newer CRT, but not the other way round. + Analogously, it should be fine, if a PHP build linked with an older version + is used with a newer CRT, but not the other way round. Otherwise, if the linker major version is not same, it is an error, as per the current knowledge. |