--- libev/event.h 2012/04/02 23:14:41 1.25 +++ libev/event.h 2012/04/02 23:15:27 1.26 @@ -75,6 +75,8 @@ #define EVLIST_INTERNAL 0x10 #define EVLIST_INIT 0x80 +typedef void (*event_callback_fn)(int, short, void *); + struct event { /* libev watchers we map onto */ @@ -86,7 +88,7 @@ /* compatibility slots */ struct event_base *ev_base; - void (*ev_callback)(int, short, void *arg); + event_callback_fn ev_callback; void *ev_arg; int ev_fd; int ev_pri; @@ -95,6 +97,8 @@ short ev_events; }; +event_callback_fn event_get_callback (const struct event *ev); + #define EV_READ EV_READ #define EV_WRITE EV_WRITE #define EV_PERSIST 0x10 @@ -141,9 +145,6 @@ typedef void (*event_log_cb)(int severity, const char *msg); void event_set_log_callback(event_log_cb cb); -typedef void (*event_callback_fn)(int, short, void *); -event_callback_fn event_get_callback (const struct event *ev); - void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg); int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv);