multiplicity, work around bugs in http.c etc.

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index 3c2f448cb0d2a1372cf453ae650422d202b5deb1..d21ed3fee5898144fb2db12bdb7f6cc7e5d98c62 100644 (file)
--- a/event.h
+++ b/event.h
@@ -31,12 +31,12 @@
 #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
 {
   /* libev watchers we map onto */
 struct event
 {
   /* libev watchers we map onto */


@@ -54,6 +54,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


@@ -61,7 +63,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)


@@ -119,5 +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);
 
 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