summaryrefslogtreecommitdiff
path: root/ext/opcache/shared_alloc_win32.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-10-03 10:57:32 +0200
committerAnatol Belski <ab@php.net>2015-10-03 10:57:32 +0200
commit4cb6342426aad20d8f92042855499bd4ea4d834c (patch)
tree2a6113608665036b539381c1494f5cdbeb01da9e /ext/opcache/shared_alloc_win32.c
parent96fe3be7f280b50ba55a1dcab8a3bf63d3e46932 (diff)
downloadphp-git-4cb6342426aad20d8f92042855499bd4ea4d834c.tar.gz
remove useless checks
Other platforms than listed in the checks are not supported since PHP 5.5. We also won't need these checks for a while, so can simplify.
Diffstat (limited to 'ext/opcache/shared_alloc_win32.c')
-rw-r--r--ext/opcache/shared_alloc_win32.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c
index fd2894e6d8..9b7bfceec1 100644
--- a/ext/opcache/shared_alloc_win32.c
+++ b/ext/opcache/shared_alloc_win32.c
@@ -251,29 +251,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
be taken (fail to map). So under Vista, we try to map into a hard coded predefined addresses
in high memory. */
if (!ZCG(accel_directives).mmap_base || !*ZCG(accel_directives).mmap_base) {
- do {
- OSVERSIONINFOEX osvi;
- SYSTEM_INFO si;
-
- ZeroMemory(&si, sizeof(SYSTEM_INFO));
- ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
-
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-
- if (! GetVersionEx ((OSVERSIONINFO *) &osvi)) {
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- if (!GetVersionEx((OSVERSIONINFO *)&osvi)) {
- break;
- }
- }
-
- GetSystemInfo(&si);
-
- /* Are we running Vista ? */
- if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 6) {
- wanted_mapping_base = vista_mapping_base_set;
- }
- } while (0);
+ wanted_mapping_base = vista_mapping_base_set;
} else {
char *s = ZCG(accel_directives).mmap_base;