zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8b5ffea13101faa5205e6d6b1feabb0479ebfd69
commit 8b5ffea13101faa5205e6d6b1feabb0479ebfd69 Author: Cedric BAIL <cedric.b...@free.fr> Date: Fri Oct 11 08:51:53 2019 -0400 ecore_con: use only Eina_Magic infrastructure for set and check in Ecore_Con. Summary: We can not have half our code rely on Ecore magic check and the other half use Eina_Magic or this will lead to inconsistency with Eina_Magic definition. Depends on D10363 Reviewers: zmike, bu5hm4n, segfaultxavi, stefan_schmidt Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10364 --- src/lib/ecore_con/ecore_con_legacy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c index d1c402e045..050a30f1f2 100644 --- a/src/lib/ecore_con/ecore_con_legacy.c +++ b/src/lib/ecore_con/ecore_con_legacy.c @@ -93,7 +93,7 @@ typedef struct _Ecore_Con_Lookup_Ctx { do \ { \ if (!svr) return __VA_ARGS__; \ - if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \ + if (!EINA_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \ { \ ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \ return __VA_ARGS__; \ @@ -113,7 +113,7 @@ typedef struct _Ecore_Con_Lookup_Ctx { do \ { \ if (!cl) return __VA_ARGS__; \ - if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \ + if (!EINA_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \ { \ ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \ return __VA_ARGS__; \ --