*** empty log message ***

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index 220421c1b3faa50fefc7786957db040499eea462..3c2f448cb0d2a1372cf453ae650422d202b5deb1 100644 (file)
--- a/event.h
+++ b/event.h
@@ -38,11 +38,15 @@ extern "C" {
 #include "ev.h"
 
 struct event
 #include "ev.h"
 
 struct event

-  {
-  struct ev_io io;
+{
+  /* libev watchers we map onto */
+  union {
+    struct ev_io io;
+    struct ev_signal sig;
+  } iosig;

   struct ev_timer to;
   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;
   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);
 
 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);
 
 
 int event_pending (struct event *ev, short, struct timeval *tv);
 


@@ -117,3 +120,4 @@ int event_base_once (struct event_base *base, int fd, short events, void (*cb)(i
 int event_base_priority_init (struct event_base *base, int fd);
 
 #endif
 int event_base_priority_init (struct event_base *base, int fd);
 
 #endif

+