diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-01-16 13:51:50 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-01-16 13:51:50 +0300 |
| commit | 1fd651650fb4821054decac5a0664f88fe4e55c3 (patch) | |
| tree | 236306873858e179c11db3223d1b60565d2dda2f /Zend/zend.c | |
| parent | 0bfc4f34caabc31a83a130af43820d369b29e800 (diff) | |
| parent | 811326089fcc2e629fcfcf6365342835fb362121 (diff) | |
| download | php-git-1fd651650fb4821054decac5a0664f88fe4e55c3.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Separate the cpuinfo initialization part and call it at startup
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 4a5fc749b7..effc95deb2 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -33,6 +33,7 @@ #include "zend_virtual_cwd.h" #include "zend_smart_str.h" #include "zend_smart_string.h" +#include "zend_cpuinfo.h" #ifdef ZTS ZEND_API int compiler_globals_id; @@ -752,6 +753,8 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) / extern zend_php_scanner_globals language_scanner_globals; #endif + zend_cpu_startup(); + #ifdef ZEND_WIN32 php_win32_cp_set_by_id(65001); #endif |