From 9e042c06860157ec18c9b90fb94f371ab94a8f41 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 9 Jul 2013 15:49:45 +0100 Subject: [PATCH] eo2: pass the object id and data to function call --- src/lib/eo/Eo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index d6b8d6a..816ac67 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -594,14 +594,14 @@ EAPI Eina_Bool eo_shutdown(void); typedef struct _Eo_Internal _Eo; -#define EO_FUNC_CALL(...) func(obj_data, __VA_ARGS__) +#define EO_FUNC_CALL(...) func(objid, obj_data, __VA_ARGS__) /* XXX: Essential, because we need to adjust objid for comp objects. */ #define EO_FUNC_BODY(Name, Ret, Id, Func, DefRet, ...) \ EAPI Ret \ Name(_Eo *obj, Eo *objid, __VA_ARGS__) \ { \ - Ret (*func)(Eo *, __VA_ARGS__) = eo2_func_get(obj, Id(Name)); \ + Ret (*func)(Eo *, void *obj_data, __VA_ARGS__) = eo2_func_get(obj, Id(Name)); \ if (!func) return DefRet; \ void *obj_data = eo2_data_scope_get(obj); \ return Func; \ -- 2.7.4