archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/opcache/zend_jit: cast function to fix -Wincompatible-pointer-types (#10527)

Browse source 
* ext/opcache/zend_jit: cast function to fix -Wincompatible-pointer-types

Regression by commit a21195650e

* TSRM/win32: fix ts_allocate_dtor cast

The dtor was casted to ts_allocate_ctor; luckily, ts_allocate_dtor and
ts_allocate_ctor just happen to be the same type.
This commit is contained in:
Max Kellermann 2023-02-07 11:38:17 +01:00 • committed by GitHub
parent a21195650e
commit afbb28dfb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TSRM/tsrm_win32.c
View file

@ -91,7 +91,7 @@ static void tsrm_win32_dtor(tsrm_win32_globals *globals)
TSRM_API void tsrm_win32_startup(void) TSRM_API void tsrm_win32_startup(void)
{/*{{{*/ {/*{{{*/
#ifdef ZTS #ifdef ZTS
ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_ctor)tsrm_win32_dtor); ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_dtor)tsrm_win32_dtor);
#else #else
tsrm_win32_ctor(&win32_globals); tsrm_win32_ctor(&win32_globals);
#endif #endif

2
ext/opcache/jit/zend_jit.c
View file

@ -4878,7 +4878,7 @@ ZEND_EXT_API int zend_jit_debug_config(zend_long old_val, zend_long new_val, int
ZEND_EXT_API void zend_jit_init(void) ZEND_EXT_API void zend_jit_init(void)
{ {
#ifdef ZTS #ifdef ZTS
jit_globals_id = ts_allocate_id(&jit_globals_id, sizeof(zend_jit_globals), (ts_allocate_ctor) zend_jit_globals_ctor, zend_jit_globals_dtor); 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);
#else #else
zend_jit_globals_ctor(&jit_globals); zend_jit_globals_ctor(&jit_globals);
#endif #endif