summaryrefslogtreecommitdiff
path: root/Zend/zend.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-05-29 11:44:46 +0200
committerAnatol Belski <ab@php.net>2015-05-29 11:47:58 +0200
commite76cf8432dd6100ebf778f4758f316f529dce5c5 (patch)
tree83fa3fd943918248f44744061f26faa371d78e2d /Zend/zend.c
parent39753fa222b42d806bb622bac22e27b4381ff099 (diff)
downloadphp-git-e76cf8432dd6100ebf778f4758f316f529dce5c5.tar.gz
fix windows version constants initialization with nts
Diffstat (limited to 'Zend/zend.c')
-rw-r--r--Zend/zend.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index f262f8b5d7..3bd0d6e714 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -727,6 +727,9 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /
ini_scanner_globals_ctor(&ini_scanner_globals);
php_scanner_globals_ctor(&language_scanner_globals);
zend_set_default_compile_time_values();
+#ifdef ZEND_WIN32
+ zend_get_windows_version_info(&EG(windows_version_info));
+#endif
#endif
EG(error_reporting) = E_ALL & ~E_NOTICE;
@@ -798,9 +801,6 @@ void zend_post_startup(void) /* {{{ */
global_persistent_list = &EG(persistent_list);
zend_copy_ini_directives();
#else
-#ifdef ZEND_WIN32
- zend_get_windows_version_info(&EG(windows_version_info));
-#endif
virtual_cwd_deactivate();
#endif
}