On Sat, 18 Sep 2010, Enlightenment SVN wrote:
> Log:
> warning--
>
>
> Author: raster
> Date: 2010-09-18 20:09:09 -0700 (Sat, 18 Sep 2010)
> New Revision: 52453
>
> Modified:
> trunk/ecore/src/lib/ecore/ecore_main.c
> trunk/ecore/src/lib/ecore/ecore_thread.c
>
> Modified: trunk/ecore/src/lib/ecore/ecore_main.c
> ===================================================================
> --- trunk/ecore/src/lib/ecore/ecore_main.c 2010-09-19 03:04:17 UTC (rev
> 52452)
> +++ trunk/ecore/src/lib/ecore/ecore_main.c 2010-09-19 03:09:09 UTC (rev
> 52453)
> @@ -141,21 +141,26 @@
> 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
why didn't you do that in your commit of embryo_amx.c ? it's cleaner than
having __UNUSED__ in #ifdef/#endif
Vincent
>
> +#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 @@
> 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 @@
> {
> ERR("Failed to delete epoll fd %d! (errno=%d)", fdh->fd, errno);
> }
> +}
> +#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 @@
> 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)
>
> Modified: trunk/ecore/src/lib/ecore/ecore_thread.c
> ===================================================================
> --- trunk/ecore/src/lib/ecore/ecore_thread.c 2010-09-19 03:04:17 UTC (rev
> 52452)
> +++ trunk/ecore/src/lib/ecore/ecore_thread.c 2010-09-19 03:09:09 UTC (rev
> 52453)
> @@ -9,9 +9,13 @@
> #ifdef EFL_HAVE_PTHREAD
> # include <pthread.h>
> # ifdef __linux__
> +# ifndef _GNU_SOURCE
> +# define _GNU_SOURCE 1
> +# endif
> # include <sched.h>
> # include <sys/time.h>
> # include <sys/resource.h>
> +# include <unistd.h>
> # include <sys/syscall.h>
> # include <errno.h>
> # endif
>
>
> ------------------------------------------------------------------------------
> Start uncovering the many advantages of virtual appliances
> and start using them to simplify application deployment and
> accelerate your shift to cloud computing.
> http://p.sf.net/sfu/novell-sfdev2dev
> _______________________________________________
> enlightenment-svn mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
>
>
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
