com php-src: This part here was moved to the EG constructor by Anatol in f51a9c71dd011f7d6879b326280adc05ae45f7f7: main/main.c
| From: | Kalle Sommer Nielsen | Date: | Sat, 04 Apr 2015 20:04:32 +0000 |
| Subject: | com php-src: This part here was moved to the EG constructor by Anatol in f51a9c71dd011f7d6879b326280adc05ae45f7f7: main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86082@lists.php.net to get a copy of this message | ||
Commit: 118a2fa8d974f593aa886a9e088a0c965e3c881c
Author: Kalle Sommer Nielsen <kalle@php.net> Sat, 4 Apr 2015 22:04:32 +0200
Parents: 69c2e53419f123d3ee9b166fcd15ae1e921d175d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=118a2fa8d974f593aa886a9e088a0c965e3c881c
Log:
This part here was moved to the EG constructor by Anatol in f51a9c71dd011f7d6879b326280adc05ae45f7f7
Changed paths:
M main/main.c
Diff:
diff --git a/main/main.c b/main/main.c
index c7468c2..08f4151 100644
--- a/main/main.c
+++ b/main/main.c
@@ -57,7 +57,7 @@
#include "zend_extensions.h"
#include "php_ini.h"
#include "php_globals.h"
-#include "php_main.h"
+#include "php_main.h
#include "fopen_wrappers.h"
#include "ext/standard/php_standard.h"
#include "ext/standard/php_string.h"
@@ -2057,19 +2057,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry
*additional_mod
zuf.resolve_path_function = php_resolve_path_for_zend;
zend_startup(&zuf, NULL);
-#ifdef PHP_WIN32
- {
- OSVERSIONINFOEX *osvi = &EG(windows_version_info);
-
- ZeroMemory(osvi, sizeof(OSVERSIONINFOEX));
- osvi->dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
- if( !GetVersionEx((OSVERSIONINFO *) osvi)) {
- php_printf("\nGetVersionEx unusable. %d\n", GetLastError());
- return FAILURE;
- }
- }
-#endif
-
#if HAVE_SETLOCALE
setlocale(LC_CTYPE, "");
zend_update_current_locale();