summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2019-10-11 08:51:53 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-10-11 09:25:04 -0400
commit8b5ffea13101faa5205e6d6b1feabb0479ebfd69 (patch)
tree026fa15a47c1b479459d70e01df351048a7f438a /src/lib/ecore_con
parente5c1eb57471b39208e578dac434bf71198f0373e (diff)
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
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c4
1 files 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 d1c402e..050a30f 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 {
93 do \ 93 do \
94 { \ 94 { \
95 if (!svr) return __VA_ARGS__; \ 95 if (!svr) return __VA_ARGS__; \
96 if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \ 96 if (!EINA_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \
97 { \ 97 { \
98 ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \ 98 ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \
99 return __VA_ARGS__; \ 99 return __VA_ARGS__; \
@@ -113,7 +113,7 @@ typedef struct _Ecore_Con_Lookup_Ctx {
113 do \ 113 do \
114 { \ 114 { \
115 if (!cl) return __VA_ARGS__; \ 115 if (!cl) return __VA_ARGS__; \
116 if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \ 116 if (!EINA_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \
117 { \ 117 { \
118 ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \ 118 ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \
119 return __VA_ARGS__; \ 119 return __VA_ARGS__; \