From 0a150e58955355f12894e8b3fdbf39887086c6d9 Mon Sep 17 00:00:00 2001 From: cedric Date: Tue, 9 Aug 2011 08:50:47 +0000 Subject: [PATCH] ecore: remove bad macro from ecore. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@62241 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore/ecore_app.c | 4 ++-- src/lib/ecore/ecore_private.h | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c index e1c915f..c29480a 100644 --- a/src/lib/ecore/ecore_app.c +++ b/src/lib/ecore/ecore_app.c @@ -43,7 +43,7 @@ static char **app_argv = NULL; EAPI void ecore_app_args_set(int argc, const char **argv) { - ECORE_MAIN_LOOP_ASSERT(); + EINA_MAIN_LOOP_CHECK_RETURN; if ((argc < 1) || (!argv)) return; @@ -65,7 +65,7 @@ ecore_app_args_set(int argc, const char **argv) EAPI void ecore_app_args_get(int *argc, char ***argv) { - ECORE_MAIN_LOOP_ASSERT(); + EINA_MAIN_LOOP_CHECK_RETURN; if (argc) *argc = app_argc; if (argv) *argv = app_argv; diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h index 0e96874..ae02c1e 100644 --- a/src/lib/ecore/ecore_private.h +++ b/src/lib/ecore/ecore_private.h @@ -187,9 +187,6 @@ void _ecore_fps_debug_runtime_add(double t); void _ecore_thread_init(void); void _ecore_thread_shutdown(void); -void _ecore_thread_assert_main_loop_thread(const char *function); - -#define ECORE_MAIN_LOOP_ASSERT() _ecore_thread_assert_main_loop_thread(__FUNCTION__) void _ecore_glib_init(void); void _ecore_glib_shutdown(void); @@ -209,7 +206,7 @@ void _ecore_unlock(void); static inline void _ecore_lock(void) { /* at least check we're not being called from a thread */ - ECORE_MAIN_LOOP_ASSERT(); + EINA_MAIN_LOOP_CHECK_RETURN; } static inline void _ecore_unlock(void) -- 2.7.4