Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6: fix win10 support
php · Oct 3, 2015 · 96fe3be · 96fe3be
2 parents e892e2e + 83bef0e
commit 96fe3be
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);