mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-12 03:15:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  drop unused parameter from zend_startup
This commit is contained in:
Joe Watkins 2019-03-11 10:10:45 +01:00
commit bf21727ea0
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend.c
View File

@ -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;

2
Zend/zend.h
View File

@ -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);

2
main/main.c
View File

@ -2148,7 +2148,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, "");