*** empty log message ***

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index 731002f12ea8e52d31f684c2c6a99336ffb757a6..1466f904f223140d2c09c309215d4f059fbdee0e 100644 (file)
--- a/event.h
+++ b/event.h
@@ -31,25 +31,29 @@
 #ifndef _EVENT_H_
 #define _EVENT_H_
 
 #ifndef _EVENT_H_
 #define _EVENT_H_
 

+#include <ev.h>
+

 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 

-#include "ev.h"
-

 struct event
 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;
   struct event_base *ev_base;

-  int ev_fd;
-  short ev_events;
-  int ev_pri;

   void (*ev_callback)(int, short, void *arg);
   void *ev_arg;
   void (*ev_callback)(int, short, void *arg);
   void *ev_arg;

+  int ev_fd;
+  int ev_pri;

   int ev_res;
   int ev_res;

+  short ev_events;

 };
 
 #define EV_PERSIST                 0x10
 };
 
 #define EV_PERSIST                 0x10


@@ -100,7 +104,7 @@ 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);
+void event_active (struct event *ev, int res, short ncalls); /* ncalls is being ignored */

 
 int event_pending (struct event *ev, short, struct timeval *tv);
 
 
 int event_pending (struct event *ev, short, struct timeval *tv);
 


@@ -116,4 +120,13 @@ int event_base_dispatch (struct event_base *base);
 int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv);
 int event_base_priority_init (struct event_base *base, int fd);
 
 int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv);
 int event_base_priority_init (struct event_base *base, int fd);
 

+#ifndef EV_STANDALONE
+# include <event_compat.h>
+#endif
+
+#ifdef __cplusplus
+}

 #endif
 #endif

+
+#endif
+