--- libev/event.h 2007/11/04 19:45:10 1.10 +++ libev/event.h 2007/11/09 17:07:59 1.14 @@ -31,12 +31,18 @@ #ifndef _EVENT_H_ #define _EVENT_H_ -#include +#ifdef EV_H +# include EV_H +#else +# include +#endif #ifdef __cplusplus extern "C" { #endif +struct event_base; + struct event { /* libev watchers we map onto */ @@ -104,14 +110,13 @@ 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); int event_priority_init (int npri); int event_priority_set (struct event *ev, int pri); -struct event_base; - int event_base_set (struct event_base *base, struct event *ev); int event_base_loop (struct event_base *base, int); int event_base_loopexit (struct event_base *base, struct timeval *tv); @@ -120,7 +125,7 @@ int event_base_priority_init (struct event_base *base, int fd); #ifndef EV_STANDALONE -# include "event_compat.h" +# include #endif #ifdef __cplusplus