Skip to content

Commit

Permalink
remove useless checks
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
weltling committed Oct 3, 2015
1 parent 96fe3be commit 4cb6342
Showing 1 changed file with 1 addition and 23 deletions.
24 changes: 1 addition & 23 deletions ext/opcache/shared_alloc_win32.c
Expand Up @@ -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;

Expand Down

0 comments on commit 4cb6342

Please sign in to comment.