diff options
| author | Josh Gao <jmgao@google.com> | 2017-08-10 12:30:25 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2017-08-10 12:30:47 -0700 |
| commit | 83a0c9c65a60a92d3ea5542596b3ba56db492c37 (patch) | |
| tree | 64bb0c050c4db9ad9d721e05e3e199bfd02e60b0 /devpoll.c | |
| parent | af241a5c8c2cde0fab7d7d563276c1095b00e3b4 (diff) | |
| download | libevent-83a0c9c65a60a92d3ea5542596b3ba56db492c37.tar.gz | |
Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?"android-o-iot-preview-5o-iot-preview-5
This reverts commits 2a572d125a91a4aafd3ad8ce87259fc640fa0763 and
af241a5c8c2cde0fab7d7d563276c1095b00e3b4, which break tombstoned.
Bug: http://b/64543673
Test: manual + treehugger
Diffstat (limited to 'devpoll.c')
| -rw-r--r-- | devpoll.c | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -25,13 +25,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "event2/event-config.h" -#include "evconfig-private.h" - -#ifdef EVENT__HAVE_DEVPOLL #include <sys/types.h> #include <sys/resource.h> -#ifdef EVENT__HAVE_SYS_TIME_H +#ifdef _EVENT_HAVE_SYS_TIME_H #include <sys/time.h> #endif #include <sys/queue.h> @@ -132,7 +129,7 @@ devpoll_init(struct event_base *base) nfiles = rl.rlim_cur; /* Initialize the kernel queue */ - if ((dpfd = evutil_open_closeonexec_("/dev/poll", O_RDWR, 0)) == -1) { + if ((dpfd = evutil_open_closeonexec("/dev/poll", O_RDWR, 0)) == -1) { event_warn("open: /dev/poll"); mm_free(devpollop); return (NULL); @@ -159,7 +156,7 @@ devpoll_init(struct event_base *base) return (NULL); } - evsig_init_(base); + evsig_init(base); return (devpollop); } @@ -217,7 +214,7 @@ devpoll_dispatch(struct event_base *base, struct timeval *tv) continue; /* XXX(niels): not sure if this works for devpoll */ - evmap_io_active_(base, events[i].fd, which); + evmap_io_active(base, events[i].fd, which); } return (0); @@ -296,7 +293,7 @@ devpoll_dealloc(struct event_base *base) { struct devpollop *devpollop = base->evbase; - evsig_dealloc_(base); + evsig_dealloc(base); if (devpollop->events) mm_free(devpollop->events); if (devpollop->changes) @@ -307,5 +304,3 @@ devpoll_dealloc(struct event_base *base) memset(devpollop, 0, sizeof(struct devpollop)); mm_free(devpollop); } - -#endif /* EVENT__HAVE_DEVPOLL */ |