--- libev/event.h 2007/11/02 11:02:23 1.3 +++ libev/event.h 2007/11/08 21:14:36 1.13 @@ -31,18 +31,22 @@ #ifndef _EVENT_H_ #define _EVENT_H_ +#include + #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; void (*ev_callback)(int, short, void *arg); void *ev_arg; @@ -100,6 +104,7 @@ int event_add (struct event *ev, struct timeval *tv); int event_del (struct event *ev); +void event_active (struct event *ev, int res, short ncalls); /* ncalls is being ignored */ int event_pending (struct event *ev, short, struct timeval *tv); @@ -115,4 +120,13 @@ 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 +#endif + +#ifdef __cplusplus +} +#endif + #endif +