*** empty log message ***

diff --git a/event.c b/event.c
index 38e379a006d47970aa9ff0a9bc7e85b9baba2139..5ed8bc5a2f33f2d99dd09b5dfc6faa46c8e4d1e3 100644 (file)
--- a/event.c
+++ b/event.c
@@ -250,14 +250,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 (&ev->to, res & EV_TIMEOUT);
+    ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
 
   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))
-    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)

diff --git a/event_compat.h b/event_compat.h
index 490757a0c5dc847e8d3d820b785d4b640908d230..84ca5bfd18b6a2f7f6b8dc6d1207d987eb194142 100644 (file)
--- a/event_compat.h
+++ b/event_compat.h
@@ -28,7 +28,9 @@
 extern "C" {
 #endif
 
+#ifndef WIN32
 #include <sys/types.h>
+#endif
 #include <sys/time.h>
 #include <stdint.h>
 #include <stdarg.h>