*** empty log message ***

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index 220421c1b3faa50fefc7786957db040499eea462..48c34e6c1fb5c4c9251df72681b6c691b632b09e 100644 (file)
--- a/event.h
+++ b/event.h
@@ -31,18 +31,24 @@
 #ifndef _EVENT_H_
 #define _EVENT_H_
 
 #ifndef _EVENT_H_
 #define _EVENT_H_
 

+#ifndef EV_EMBED
+# include "ev.h"
+#endif
+

 #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;
   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;


@@ -50,6 +56,8 @@ struct event
   int ev_pri;
   int ev_res;
   short ev_events;
   int ev_pri;
   int ev_res;
   short ev_events;

+
+  char initialised; /* flag to work around some idiosynchrasies in the API */

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


@@ -57,7 +65,7 @@ struct event
 #define EVENT_SIGNAL(ev)           ((int) (ev)->ev_fd)
 #define EVENT_FD(ev)               ((int) (ev)->ev_fd)
 
 #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)
 
 #define evtimer_add(ev,tv)         event_add (ev, tv)
 #define evtimer_set(ev,cb,data)    event_set (ev, -1, 0, cb, data)


@@ -100,7 +108,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);
 


@@ -116,4 +123,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_EMBED
+# include "event_compat.h"
+#endif
+
+#ifdef __cplusplus
+}

 #endif
 #endif

+
+#endif
+