Skip to content

Commit 8ad81c0

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: ext/opcache/zend_jit: cast function to fix -Wincompatible-pointer-types (#10527)
2 parents 29efbe5 + afbb28d commit 8ad81c0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

TSRM/tsrm_win32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static void tsrm_win32_dtor(tsrm_win32_globals *globals)
8989
TSRM_API void tsrm_win32_startup(void)
9090
{/*{{{*/
9191
#ifdef ZTS
92-
ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_ctor)tsrm_win32_dtor);
92+
ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_dtor)tsrm_win32_dtor);
9393
#else
9494
tsrm_win32_ctor(&win32_globals);
9595
#endif

ext/opcache/jit/zend_jit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4853,7 +4853,7 @@ ZEND_EXT_API int zend_jit_debug_config(zend_long old_val, zend_long new_val, int
48534853
ZEND_EXT_API void zend_jit_init(void)
48544854
{
48554855
#ifdef ZTS
4856-
jit_globals_id = ts_allocate_id(&jit_globals_id, sizeof(zend_jit_globals), (ts_allocate_ctor) zend_jit_globals_ctor, zend_jit_globals_dtor);
4856+
jit_globals_id = ts_allocate_id(&jit_globals_id, sizeof(zend_jit_globals), (ts_allocate_ctor) zend_jit_globals_ctor, (ts_allocate_dtor) zend_jit_globals_dtor);
48574857
#else
48584858
zend_jit_globals_ctor(&jit_globals);
48594859
#endif

0 commit comments

Comments
 (0)