--- libev/event.h 2007/11/02 22:03:00 1.5 +++ libev/event.h 2007/11/09 17:07:59 1.14 @@ -31,11 +31,17 @@ #ifndef _EVENT_H_ #define _EVENT_H_ +#ifdef EV_H +# include EV_H +#else +# include +#endif + #ifdef __cplusplus extern "C" { #endif -#include "ev.h" +struct event_base; struct event { @@ -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); @@ -119,5 +124,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