From: raster Date: Sun, 19 Sep 2010 03:09:09 +0000 (+0000) Subject: warning-- X-Git-Tag: build/2012-07-04.173327~1790 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d07bbbf250ad0f0625f2b49210b7c32426169a7c;p=profile%2Fivi%2Fecore.git warning-- git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@52453 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index f2d5f86..4193ed0 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -141,21 +141,26 @@ static gboolean ecore_idling; static gboolean ecore_fds_ready; #endif +#ifdef HAVE_EPOLL static inline int _ecore_poll_events_from_fdh(Ecore_Fd_Handler *fdh) { int events = 0; -#ifdef HAVE_EPOLL if (fdh->flags & ECORE_FD_READ) events |= EPOLLIN; if (fdh->flags & ECORE_FD_WRITE) events |= EPOLLOUT; if (fdh->flags & ECORE_FD_ERROR) events |= EPOLLERR; -#endif return events; } +#else +static inline int _ecore_poll_events_from_fdh(Ecore_Fd_Handler *fdh __UNUSED__) +{ + return 0; +} +#endif +#ifdef HAVE_EPOLL static inline int _ecore_main_fdh_epoll_add(Ecore_Fd_Handler *fdh) { int r = 0; -#ifdef HAVE_EPOLL struct epoll_event ev; memset(&ev, 0, sizeof (ev)); @@ -163,13 +168,18 @@ static inline int _ecore_main_fdh_epoll_add(Ecore_Fd_Handler *fdh) ev.data.ptr = fdh; INF("adding poll on %d %08x", fdh->fd, ev.events); r = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fdh->fd, &ev); -#endif return r; } +#else +static inline int _ecore_main_fdh_epoll_add(Ecore_Fd_Handler *fdh __UNUSED__) +{ + return 0; +} +#endif +#ifdef HAVE_EPOLL static inline void _ecore_main_fdh_epoll_del(Ecore_Fd_Handler *fdh) { -#ifdef HAVE_EPOLL struct epoll_event ev; memset(&ev, 0, sizeof (ev)); @@ -180,13 +190,17 @@ static inline void _ecore_main_fdh_epoll_del(Ecore_Fd_Handler *fdh) { ERR("Failed to delete epoll fd %d! (errno=%d)", fdh->fd, errno); } -#endif } +#else +static inline void _ecore_main_fdh_epoll_del(Ecore_Fd_Handler *fdh __UNUSED__) +{ +} +#endif +#ifdef HAVE_EPOLL static inline int _ecore_main_fdh_epoll_modify(Ecore_Fd_Handler *fdh) { int r = 0; -#ifdef HAVE_EPOLL struct epoll_event ev; memset(&ev, 0, sizeof (ev)); @@ -194,9 +208,14 @@ static inline int _ecore_main_fdh_epoll_modify(Ecore_Fd_Handler *fdh) ev.data.ptr = fdh; INF("modifing epoll on %d to %08x", fdh->fd, ev.events); r = epoll_ctl(epoll_fd, EPOLL_CTL_MOD, fdh->fd, &ev); -#endif return r; } +#else +static inline int _ecore_main_fdh_epoll_modify(Ecore_Fd_Handler *fdh __UNUSED__) +{ + return 0; +} +#endif #ifdef HAVE_EPOLL static inline int _ecore_main_fdh_epoll_mark_active(void) diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c index 148227b..1e82f4d 100644 --- a/src/lib/ecore/ecore_thread.c +++ b/src/lib/ecore/ecore_thread.c @@ -9,9 +9,13 @@ #ifdef EFL_HAVE_PTHREAD # include # ifdef __linux__ +# ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +# endif # include # include # include +# include # include # include # endif