From: George Peter Banyard Date: Thu, 3 Sep 2020 11:05:50 +0000 (+0200) Subject: Fix mismatch between macro and struct definition X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b3ac296a5242f9ded4d2dc7cf2c6349e583caf8;p=php Fix mismatch between macro and struct definition --- diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 301faf16cd..462850993a 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -309,7 +309,7 @@ PHP 8.0 INTERNALS UPGRADE NOTES - zend_multibyte_set_filter() - zend_lex_tstring() - _zend_module_entry module_startup_func, module_shutdown_func, - request_startup_func, and request_shutdown_func function pointers + request_startup_func, request_shutdown_func, and post_deactivate_func function pointers - (*zend_encoding_list_parser) typedef - (*zend_encoding_internal_encoding_setter) typedef - zend_multibyte_set_functions() diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h index cb64324d38..ccd77f9eb6 100644 --- a/Zend/zend_modules.h +++ b/Zend/zend_modules.h @@ -91,7 +91,7 @@ struct _zend_module_entry { #endif void (*globals_ctor)(void *global); void (*globals_dtor)(void *global); - int (*post_deactivate_func)(void); + zend_result (*post_deactivate_func)(void); int module_started; unsigned char type; void *handle;