*** empty log message ***

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index 220421c1b3faa50fefc7786957db040499eea462..03506ad63656dde9e7391cef8421e658449659a5 100644 (file)
--- a/event.h
+++ b/event.h
@@ -38,11 +38,15 @@ extern "C" {
 #include "ev.h"
 
 struct event
-  {
-  struct ev_io io;
+{
+  /* lib watchers we map to */
+  union {
+    struct ev_io io;
+    struct ev_signal sig;
+  } iosig;
   struct ev_timer to;
-  struct ev_signal sig;
 
+  /* compatibility slots */
   struct event_base *ev_base;
   void (*ev_callback)(int, short, void *arg);
   void *ev_arg;
@@ -100,7 +104,6 @@ int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg,
 
 int event_add (struct event *ev, struct timeval *tv);
 int event_del (struct event *ev);
-void event_active (struct event *ev, int fd, short events);
 
 int event_pending (struct event *ev, short, struct timeval *tv);