X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/d68da9db1b34dbd6f29a0576bc897a9c49e4d7ed..0f411518435b7edf24d4bddcc86e5958f7e3d23f:/event.h?ds=sidebyside diff --git a/event.h b/event.h index 48c34e6..5226924 100644 --- a/event.h +++ b/event.h @@ -31,9 +31,7 @@ #ifndef _EVENT_H_ #define _EVENT_H_ -#ifndef EV_EMBED -# include "ev.h" -#endif +#include #ifdef __cplusplus extern "C" { @@ -56,8 +54,6 @@ struct event int ev_pri; int ev_res; short ev_events; - - char initialised; /* flag to work around some idiosynchrasies in the API */ }; #define EV_PERSIST 0x10 @@ -65,7 +61,7 @@ struct event #define EVENT_SIGNAL(ev) ((int) (ev)->ev_fd) #define EVENT_FD(ev) ((int) (ev)->ev_fd) -#define event_initialized(ev) ((ev)->initialised) +#define event_initialized(ev) 1 #define evtimer_add(ev,tv) event_add (ev, tv) #define evtimer_set(ev,cb,data) event_set (ev, -1, 0, cb, data) @@ -123,7 +119,7 @@ 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); -#ifndef EV_EMBED +#ifndef EV_STANDALONE # include "event_compat.h" #endif