need to rethinkg design, maybe use 'proper' struct subclassing due to aliasing restri...

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index 220421c1b3faa50fefc7786957db040499eea462..5226924f85cb96bd6d35f02ff2fdad2af80f8646 100644 (file)
--- a/event.h
+++ b/event.h
@@ -31,18 +31,22 @@
 #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;
   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);
 


@@ -116,4 +119,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

+