fix bug

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index 38e379a006d47970aa9ff0a9bc7e85b9baba2139..8fed83d75fd1a4552a60aaa932e93ac1c2e2a7ef 100644 (file)
--- a/event.c
+++ b/event.c
@@ -37,8 +37,11 @@
 # include <sys/time.h>
 #endif
 
 # 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
 
 #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)
 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
   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;
 
   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)
 {
 
 void event_active (struct event *ev, int res, short ncalls)
 {

+  dLOOPev;
+

   if (res & EV_TIMEOUT)
   if (res & EV_TIMEOUT)

-    ev_feed_event (&ev->to, res & EV_TIMEOUT);
+    ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);

 
   if (res & EV_SIGNAL)
 
   if (res & EV_SIGNAL)

-    ev_feed_event (&ev->iosig.sig, res & EV_SIGNAL);
+    ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);

 
   if (res & (EV_READ | EV_WRITE))
 
   if (res & (EV_READ | EV_WRITE))

-    ev_feed_event (&ev->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)
 }
 
 int event_pending (struct event *ev, short events, struct timeval *tv)