>From 4871c0fcc39192065e37eb0bfec8889ac759f01b Mon Sep 17 00:00:00 2001
From: Mike McCormack <[email protected]>
Date: Tue, 19 Oct 2010 22:04:38 +0900
Subject: [PATCH 1/2] Fix a build issue with both epoll and g_main_loop()
---
trunk/ecore/src/lib/ecore/ecore_main.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/trunk/ecore/src/lib/ecore/ecore_main.c b/trunk/ecore/src/lib/ecore/ecore_main.c
index 1b33a19..f9d142f 100644
--- a/trunk/ecore/src/lib/ecore/ecore_main.c
+++ b/trunk/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)
--
1.7.0.4
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
