diff options
| author | Anatol Belski <ab@php.net> | 2015-10-03 10:46:10 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-10-03 10:46:10 +0200 |
| commit | 96fe3be7f280b50ba55a1dcab8a3bf63d3e46932 (patch) | |
| tree | 9dc6141338d264b914b1b67e544f31c9ee7181d2 /ext/opcache/shared_alloc_win32.c | |
| parent | e892e2e25339c2f582dbb3f1b7e3660e9bf1ecee (diff) | |
| parent | 83bef0ef83f645a6b84ba77b7c69ecdbad68f0a1 (diff) | |
| download | php-git-96fe3be7f280b50ba55a1dcab8a3bf63d3e46932.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix win10 support
Diffstat (limited to 'ext/opcache/shared_alloc_win32.c')
| -rw-r--r-- | ext/opcache/shared_alloc_win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c index 68e5e0cba7..fd2894e6d8 100644 --- a/ext/opcache/shared_alloc_win32.c +++ b/ext/opcache/shared_alloc_win32.c @@ -270,7 +270,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_ GetSystemInfo(&si); /* Are we running Vista ? */ - if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion == 6) { + if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 6) { wanted_mapping_base = vista_mapping_base_set; } } while (0); |