diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-03-11 10:10:14 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-03-11 10:10:14 +0100 |
| commit | df6e9fae8f85f9799866e76fafc82f90373574e7 (patch) | |
| tree | e83928556e959111d867152b62d7245d100ff7fb | |
| parent | 9f6f6fe2199857ffc8eaab3f413c0fd18cca26f0 (diff) | |
| download | php-git-df6e9fae8f85f9799866e76fafc82f90373574e7.tar.gz | |
drop unused parameter from zend_startup
| -rw-r--r-- | Zend/zend.c | 2 | ||||
| -rw-r--r-- | Zend/zend.h | 2 | ||||
| -rw-r--r-- | main/main.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 079581c99f..7361efcb0e 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -773,7 +773,7 @@ static zend_bool php_auto_globals_create_globals(zend_string *name) /* {{{ */ } /* }}} */ -int zend_startup(zend_utility_functions *utility_functions, char **extensions) /* {{{ */ +int zend_startup(zend_utility_functions *utility_functions) /* {{{ */ { #ifdef ZTS zend_compiler_globals *compiler_globals; diff --git a/Zend/zend.h b/Zend/zend.h index 76d1bb2bb5..4839b994b9 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -234,7 +234,7 @@ typedef int (*zend_write_func_t)(const char *str, size_t str_length); #define zend_first_try EG(bailout)=NULL; zend_try BEGIN_EXTERN_C() -int zend_startup(zend_utility_functions *utility_functions, char **extensions); +int zend_startup(zend_utility_functions *utility_functions); void zend_shutdown(void); void zend_register_standard_ini_entries(void); int zend_post_startup(void); diff --git a/main/main.c b/main/main.c index 5692c76ca4..5e18630bd9 100644 --- a/main/main.c +++ b/main/main.c @@ -2174,7 +2174,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod zuf.printf_to_smart_str_function = php_printf_to_smart_str; zuf.getenv_function = sapi_getenv; zuf.resolve_path_function = php_resolve_path_for_zend; - zend_startup(&zuf, NULL); + zend_startup(&zuf); #if HAVE_SETLOCALE setlocale(LC_CTYPE, ""); |