mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-05 06:46:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

hook: avoid macro expansion of the method names

Browse source 
Fixes #4491
This commit is contained in:
Barnabás Pőcze 2025-01-09 12:55:18 +01:00 • committed by Wim Taymans
parent 509e769aa5
commit 3752535171
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spa/include/spa/utils/hook.h
View file

@ -166,14 +166,14 @@ struct spa_interface {
const type *_f = (const type *) (callbacks)->funcs; \ const type *_f = (const type *) (callbacks)->funcs; \
bool _res = SPA_CALLBACK_CHECK(_f,method,vers); \ bool _res = SPA_CALLBACK_CHECK(_f,method,vers); \
if (SPA_LIKELY(_res)) \ if (SPA_LIKELY(_res)) \
_f->method((callbacks)->data, ## __VA_ARGS__); \ (_f->method)((callbacks)->data, ## __VA_ARGS__); \
_res; \ _res; \
}) })
#define spa_callbacks_call_fast(callbacks,type,method,vers,...) \ #define spa_callbacks_call_fast(callbacks,type,method,vers,...) \
({ \ ({ \
const type *_f = (const type *) (callbacks)->funcs; \ const type *_f = (const type *) (callbacks)->funcs; \
_f->method((callbacks)->data, ## __VA_ARGS__); \ (_f->method)((callbacks)->data, ## __VA_ARGS__); \
true; \ true; \
}) })
@ -207,13 +207,13 @@ struct spa_interface {
({ \ ({ \
const type *_f = (const type *) (callbacks)->funcs; \ const type *_f = (const type *) (callbacks)->funcs; \
if (SPA_LIKELY(SPA_CALLBACK_CHECK(_f,method,vers))) \ if (SPA_LIKELY(SPA_CALLBACK_CHECK(_f,method,vers))) \
res = _f->method((callbacks)->data, ## __VA_ARGS__); \ res = (_f->method)((callbacks)->data, ## __VA_ARGS__); \
res; \ res; \
}) })
#define spa_callbacks_call_fast_res(callbacks,type,res,method,vers,...) \ #define spa_callbacks_call_fast_res(callbacks,type,res,method,vers,...) \
({ \ ({ \
const type *_f = (const type *) (callbacks)->funcs; \ const type *_f = (const type *) (callbacks)->funcs; \
res = _f->method((callbacks)->data, ## __VA_ARGS__); \ res = (_f->method)((callbacks)->data, ## __VA_ARGS__); \
}) })
/** /**
@ -257,18 +257,18 @@ struct spa_interface {
#define spa_api_func_v(o,method,version,...) \ #define spa_api_func_v(o,method,version,...) \
({ \ ({ \
if (SPA_LIKELY(SPA_CALLBACK_CHECK(o,method,version))) \ if (SPA_LIKELY(SPA_CALLBACK_CHECK(o,method,version))) \
(o)->method(o, ##__VA_ARGS__); \ ((o)->method)(o, ##__VA_ARGS__); \
}) })
#define spa_api_func_r(rtype,def,o,method,version,...) \ #define spa_api_func_r(rtype,def,o,method,version,...) \
({ \ ({ \
rtype _res = def; \ rtype _res = def; \
if (SPA_LIKELY(SPA_CALLBACK_CHECK(o,method,version))) \ if (SPA_LIKELY(SPA_CALLBACK_CHECK(o,method,version))) \
_res = (o)->method(o, ##__VA_ARGS__); \ _res = ((o)->method)(o, ##__VA_ARGS__); \
_res; \ _res; \
}) })
#define spa_api_func_fast(o,method,...) \ #define spa_api_func_fast(o,method,...) \
({ \ ({ \
(o)->method(o, ##__VA_ARGS__); \ ((o)->method)(o, ##__VA_ARGS__); \
}) })
#define spa_api_method_v(type,o,method,version,...) \ #define spa_api_method_v(type,o,method,version,...) \