From 0bad021252b46042501611d0102635f8ac7ecd38 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 20 Oct 2010 14:18:23 +0000 Subject: [PATCH] from mike: Fix a build issue with both epoll and g_main_loop() SVN revision: 53671 --- legacy/ecore/src/lib/ecore/ecore_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/legacy/ecore/src/lib/ecore/ecore_main.c index 1b33a19ed7..f9d142f19d 100644 --- a/legacy/ecore/src/lib/ecore/ecore_main.c +++ b/legacy/ecore/src/lib/ecore/ecore_main.c @@ -324,9 +324,8 @@ static inline int _ecore_main_fdh_poll_mark_active(void) return ret; } -#endif -#ifdef USE_G_MAIN_LOOP +#elif USE_G_MAIN_LOOP static inline int _ecore_main_fdh_poll_mark_active(void) { @@ -350,6 +349,10 @@ static inline int _ecore_main_fdh_poll_mark_active(void) return ret; } +#endif + +#ifdef USE_G_MAIN_LOOP + /* like we are about to enter main_loop_select in _ecore_main_select */ static gboolean _ecore_main_gsource_prepare(GSource *source, gint *next_time)