--- libev/ev_epoll.c 2007/11/06 00:52:33 1.21 +++ libev/ev_epoll.c 2007/11/23 05:00:45 1.24 @@ -52,7 +52,7 @@ epoll_poll (EV_P_ ev_tstamp timeout) { int i; - int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, ceil (timeout * 1000.)); + int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.)); if (eventcnt < 0) { @@ -75,7 +75,7 @@ { ev_free (epoll_events); epoll_eventmax = array_roundsize (epoll_events, epoll_eventmax << 1); - epoll_events = ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); + epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); } } @@ -94,9 +94,9 @@ method_poll = epoll_poll; epoll_eventmax = 64; /* intiial number of events receivable per poll */ - epoll_events = ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); + epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); - return EVMETHOD_EPOLL; + return EVBACKEND_EPOLL; } static void @@ -110,15 +110,10 @@ static void epoll_fork (EV_P) { - for (;;) - { - epoll_fd = epoll_create (256); - - if (epoll_fd >= 0) - break; + close (epoll_fd); - syserr ("(libev) epoll_create"); - } + while ((epoll_fd = epoll_create (256)) < 0) + syserr ("(libev) epoll_create"); fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);