com php-src: fix windows version constants initialization with nts: Zend/zend.c

From: Date: Fri, 29 May 2015 09:47:58 +0000
Subject: com php-src: fix windows version constants initialization with nts: Zend/zend.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86992@lists.php.net to get a copy of this message
Commit: e76cf8432dd6100ebf778f4758f316f529dce5c5 Author: Anatol Belski <ab@php.net> Fri, 29 May 2015 11:44:46 +0200 Parents: 39753fa222b42d806bb622bac22e27b4381ff099 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e76cf8432dd6100ebf778f4758f316f529dce5c5 Log: fix windows version constants initialization with nts Changed paths: M Zend/zend.c Diff: diff --git a/Zend/zend.c b/Zend/zend.c index f262f8b..3bd0d6e 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 }

« previous php.cvs (#86992) next »