danog/ext-uv
1
0
Fork 0
mirror of https://github.com/danog/ext-uv.git synced 2024-11-30 04:29:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix PHP-7.4+ build

Browse Source
This commit is contained in:
Bob Weinand 2019-04-28 12:50:24 +02:00
parent 1cb0668a63
commit 5a851173a3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
php_uv.c
View File

@ -1386,7 +1386,11 @@ static int php_uv_do_callback3(zval *retval_ptr, php_uv_t *uv, zval *params, int
uv->callback[type]->fcc.function_handler = &fn; uv->callback[type]->fcc.function_handler = &fn;
ops = &fn.op_array; ops = &fn.op_array;
#if PHP_VERSION_ID < 70400
ops->run_time_cache = NULL; ops->run_time_cache = NULL;
#else
ZEND_MAP_PTR_SET(ops->run_time_cache, NULL);
#endif
if (ops->fn_flags) { if (ops->fn_flags) {
ops->fn_flags &= ~ZEND_ACC_CLOSURE; ops->fn_flags &= ~ZEND_ACC_CLOSURE;
ops->prototype = NULL; ops->prototype = NULL;
@ -1400,9 +1404,12 @@ static int php_uv_do_callback3(zval *retval_ptr, php_uv_t *uv, zval *params, int
error = -1; error = -1;
} zend_end_try(); } zend_end_try();
// after PHP 7.4 this is arena allocated and automatically freed
#if PHP_VERSION_ID < 70400
if (ops->run_time_cache && !ops->function_name) { if (ops->run_time_cache && !ops->function_name) {
efree(ops->run_time_cache); efree(ops->run_time_cache);
} }
#endif
uv->callback[type]->fcc.function_handler = old_fn; uv->callback[type]->fcc.function_handler = old_fn;