forked from enlightenment/efl
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
This commit is contained in:
parent
e5c1eb5747
commit
8b5ffea131
|
@ -93,7 +93,7 @@ typedef struct _Ecore_Con_Lookup_Ctx {
|
||||||
do \
|
do \
|
||||||
{ \
|
{ \
|
||||||
if (!svr) return __VA_ARGS__; \
|
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__); \
|
ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \
|
||||||
return __VA_ARGS__; \
|
return __VA_ARGS__; \
|
||||||
|
@ -113,7 +113,7 @@ typedef struct _Ecore_Con_Lookup_Ctx {
|
||||||
do \
|
do \
|
||||||
{ \
|
{ \
|
||||||
if (!cl) return __VA_ARGS__; \
|
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__); \
|
ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \
|
||||||
return __VA_ARGS__; \
|
return __VA_ARGS__; \
|
||||||
|
|
Loading…
Reference in New Issue