Merge branch 'PHP-8.1' into PHP-8.2

This commit is contained in:
Jakub Zelenka 2023-11-09 13:32:33 +00:00
commit c6eeb83e1f
No known key found for this signature in database
GPG key ID: 1C0779DC5C0A9DE4
4 changed files with 4 additions and 28 deletions

View file

@ -366,9 +366,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
{
#ifdef HAVE_SYSLOG_H
PHP_MSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
#ifdef ZTS
ts_free_id(basic_globals_id);
#ifdef PHP_WIN32
@ -425,9 +422,6 @@ PHP_RINIT_FUNCTION(basic) /* {{{ */
BG(user_shutdown_function_names) = NULL;
PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
BASIC_RINIT_SUBMODULE(syslog)
#endif
BASIC_RINIT_SUBMODULE(dir)
BASIC_RINIT_SUBMODULE(url_scanner_ex)
@ -477,9 +471,7 @@ PHP_RSHUTDOWN_FUNCTION(basic) /* {{{ */
PHP_RSHUTDOWN(filestat)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
#ifdef PHP_WIN32
BASIC_RSHUTDOWN_SUBMODULE(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
BASIC_RSHUTDOWN_SUBMODULE(syslog);
#endif
BASIC_RSHUTDOWN_SUBMODULE(assert)
BASIC_RSHUTDOWN_SUBMODULE(url_scanner_ex)