From 48c2c1dfba787274e7e0e5ef428b5a858d572a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 22 Jul 2013 17:31:58 +0000 Subject: [PATCH] eo2: rename func parameter into _func_ --- src/lib/eo/Eo.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index d128c6a3f3..8c3c00eb8b 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -624,8 +624,8 @@ typedef struct _Eo2_Op_Call_Data #define eo2_o _obj_, _objid_ // to pass the internal function call to EO_FUNC_BODY (as Func parameter) -#define EO_FUNC_CALL() func(objid, call.data) -#define EO_FUNC_CALLV(...) func(objid, call.data, __VA_ARGS__) +#define EO_FUNC_CALL() _func_(objid, call.data) +#define EO_FUNC_CALLV(...) _func_(objid, call.data, __VA_ARGS__) // cache OP id, get real fct and object data then do the call #define _EO_FUNC_COMMON(Name, Ret, Func, DefRet) \ @@ -633,7 +633,7 @@ typedef struct _Eo2_Op_Call_Data if ( op == EO_NOOP ) op = eo2_get_op_id(obj, (void*)Name); \ Eo2_Op_Call_Data call; \ if (!eo2_call_resolve(obj, op, &call)) return DefRet; \ - __##Name##_func func = (__##Name##_func) call.func; \ + __##Name##_func _func_ = (__##Name##_func) call.func; \ return Func; \ /* XXX: Essential, because we need to adjust objid for comp objects. */