X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/93de14fb2ac9996d3330d1fce388e75b3b2fb91a..8e9cc117343ca0af447ab1ef95fbed49d91aef85:/event.c?ds=inline diff --git a/event.c b/event.c index 5ed8bc5..8fed83d 100644 --- a/event.c +++ b/event.c @@ -37,8 +37,11 @@ # include #endif -#include "ev.h" -#include "event.h" +#ifdef EV_EVENT_H +# include EV_EVENT_H +#else +# include "event.h" +#endif #if EV_MULTIPLICITY # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base @@ -178,11 +181,11 @@ x_cb_to (EV_P_ struct ev_timer *w, int revents) void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) { if (events & EV_SIGNAL) - ev_watcher_init (&ev->iosig.sig, x_cb_sig); + ev_init (&ev->iosig.sig, x_cb_sig); else - ev_watcher_init (&ev->iosig.io, x_cb_io); + ev_init (&ev->iosig.io, x_cb_io); - ev_watcher_init (&ev->to, x_cb_to); + ev_init (&ev->to, x_cb_to); ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ ev->ev_fd = fd;