multiplicity, work around bugs in http.c etc.

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index 731002f12ea8e52d31f684c2c6a99336ffb757a6..d21ed3fee5898144fb2db12bdb7f6cc7e5d98c62 100644 (file)
--- a/event.h
+++ b/event.h
@@ -31,25 +31,31 @@
 #ifndef _EVENT_H_
 #define _EVENT_H_
 
+#include "ev.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#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_signal sig;
 
+  /* compatibility slots */
   struct event_base *ev_base;
-  int ev_fd;
-  short ev_events;
-  int ev_pri;
   void (*ev_callback)(int, short, void *arg);
   void *ev_arg;
+  int ev_fd;
+  int ev_pri;
   int ev_res;
+  short ev_events;
+
+  char initialised; /* flag to work around some idiosynchrasies in the API */
 };
 
 #define EV_PERSIST                 0x10
@@ -57,7 +63,7 @@ struct event
 #define EVENT_SIGNAL(ev)           ((int) (ev)->ev_fd)
 #define EVENT_FD(ev)               ((int) (ev)->ev_fd)
 
-#define event_initialized(ev)      1
+#define event_initialized(ev)      ((ev)->initialised)
 
 #define evtimer_add(ev,tv)         event_add (ev, tv)
 #define evtimer_set(ev,cb,data)    event_set (ev, -1, 0, cb, data)
@@ -100,7 +106,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);
 
@@ -116,4 +121,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);
 
+#ifndef EV_STANDALONE
+# include "event_compat.h"
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
+