diff options
| author | Marcus Boerger <helly@php.net> | 2008-12-31 14:05:22 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-12-31 14:05:22 +0000 |
| commit | 2faea53de22c3297bde373bdd3b4fd021a47caab (patch) | |
| tree | 6c22d413422121985c0f93c48dbc416177ac142c /Zend | |
| parent | 0bbbe4215643a70fccfceede256aa5ec8aa3ce9b (diff) | |
| download | php-git-2faea53de22c3297bde373bdd3b4fd021a47caab.tar.gz | |
- Sync with HEAD, no ability to not start builtin functions
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend.c | 6 | ||||
| -rw-r--r-- | Zend/zend.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 5e76ca453a..f3b702c867 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -588,7 +588,7 @@ static void php_scanner_globals_ctor(zend_php_scanner_globals *scanner_globals_p void zend_init_opcodes_handlers(void); -int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions TSRMLS_DC) /* {{{ */ +int zend_startup(zend_utility_functions *utility_functions, char **extensions TSRMLS_DC) /* {{{ */ { #ifdef ZTS zend_compiler_globals *compiler_globals; @@ -685,10 +685,8 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i EG(user_error_handler) = NULL; EG(user_exception_handler) = NULL; #endif - if (start_builtin_functions) { - zend_startup_builtin_functions(TSRMLS_C); - } + zend_startup_builtin_functions(TSRMLS_C); zend_register_standard_constants(TSRMLS_C); zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, NULL TSRMLS_CC); diff --git a/Zend/zend.h b/Zend/zend.h index 008d163999..a04219c0bb 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -526,7 +526,7 @@ typedef int (*zend_write_func_t)(const char *str, uint str_length); #define OE_IS_OBJECT (1<<1) #define OE_IS_METHOD (1<<2) -int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions TSRMLS_DC); +int zend_startup(zend_utility_functions *utility_functions, char **extensions TSRMLS_DC); void zend_shutdown(TSRMLS_D); void zend_register_standard_ini_entries(TSRMLS_D); void zend_post_startup(TSRMLS_D); |