com php-src: remove useless checks: ext/opcache/shared_alloc _win32.c
| From: | Anatol Belski | Date: | Sat, 03 Oct 2015 08:57:32 +0000 |
| Subject: | com php-src: remove useless checks: ext/opcache/shared_alloc _win32.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89275@lists.php.net to get a copy of this message | ||
Commit: 4cb6342426aad20d8f92042855499bd4ea4d834c
Author: Anatol Belski <ab@php.net> Sat, 3 Oct 2015 10:57:32 +0200
Parents: 96fe3be7f280b50ba55a1dcab8a3bf63d3e46932
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4cb6342426aad20d8f92042855499bd4ea4d834c
Log:
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.
Changed paths:
M ext/opcache/shared_alloc_win32.c
Diff:
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c
index fd2894e..9b7bfce 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;