X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/691ff6d0d32c60f66a03079376110c1371614ef2..f0e9f4e4e09ba9877ac4d15fefde761cc96cd317:/event.c?ds=sidebyside

diff --git a/event.c b/event.c
index b374e68..8fed83d 100644
--- a/event.c
+++ b/event.c
@@ -37,8 +37,11 @@
 # include <sys/time.h>
 #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;
@@ -250,14 +253,16 @@ int event_del (struct event *ev)
 
 void event_active (struct event *ev, int res, short ncalls)
 {
+  dLOOPev;
+
   if (res & EV_TIMEOUT)
-    ev_feed_event (&iosig.to, res & EV_TIMEOUT);
+    ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
 
   if (res & EV_SIGNAL)
-    ev_feed_event (&iosig.sig, res & EV_SIGNAL);
+    ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
 
   if (res & (EV_READ | EV_WRITE))
-    ev_feed_event (&iosig.io, res & (EV_READ | EV_WRITE));
+    ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
 }
 
 int event_pending (struct event *ev, short events, struct timeval *tv)