X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/7e305734bf37cb00b5be4f32a80bccdf83c768b8..99c0baac0b99f53c7a0bb4a0c5a8a10e8b97605f:/ev.h?ds=sidebyside diff --git a/ev.h b/ev.h index 4e4c378..384df3e 100644 --- a/ev.h +++ b/ev.h @@ -203,7 +203,7 @@ struct ev_check EV_WATCHER (ev_check) }; -/* invoked when sigchld is received and waitpid indicates the givne pid */ +/* invoked when sigchld is received and waitpid indicates the given pid */ /* revent EV_CHILD */ /* does not support priorities */ struct ev_child @@ -233,7 +233,7 @@ union ev_any_watcher /* bits for ev_default_loop and ev_loop_new */ /* the default */ -#define EVMETHOD_AUTO 0x00000000 /* not quite a mask */ +#define EVFLAG_AUTO 0x00000000 /* not quite a mask */ /* method bits to be ored together */ #define EVMETHOD_SELECT 0x00000001 /* about anywhere */ @@ -241,10 +241,10 @@ union ev_any_watcher #define EVMETHOD_EPOLL 0x00000004 /* linux */ #define EVMETHOD_KQUEUE 0x00000008 /* bsd */ #define EVMETHOD_DEVPOLL 0x00000010 /* solaris 8 */ /* NYI */ -#define EVMETHOD_PORT 0x00000020 /* solaris 10 */ /* NYI */ +#define EVMETHOD_PORT 0x00000020 /* solaris 10 */ /* flag bits */ -#define EVMETHOD_NOENV 0x01000000 /* do NOT consult environment */ +#define EVFLAG_NOENV 0x01000000 /* do NOT consult environment */ #if EV_PROTOTYPES int ev_version_major (void); @@ -269,7 +269,17 @@ void ev_set_syserr_cb (void (*cb)(const char *msg)); # if EV_MULTIPLICITY /* the default loop is the only one that handles signals and child watchers */ /* you can call this as often as you like */ -struct ev_loop *ev_default_loop (unsigned int flags); /* returns default loop */ +static struct ev_loop * +ev_default_loop (unsigned int flags) +{ + extern struct ev_loop *ev_default_loop_ptr; + extern struct ev_loop *ev_default_loop_init (unsigned int flags); + + if (!ev_default_loop_ptr) + ev_default_loop_init (flags); + + return ev_default_loop_ptr; +} /* create and destroy alternative loops that don't handle signals */ struct ev_loop *ev_loop_new (unsigned int flags); @@ -280,7 +290,7 @@ ev_tstamp ev_now (EV_P); /* time w.r.t. timers and the eventloop, updated after # else -int ev_default_loop (int methods); /* returns true when successful */ +int ev_default_loop (unsigned int flags); /* returns true when successful */ static ev_tstamp ev_now (void) @@ -298,12 +308,12 @@ void ev_default_destroy (void); /* destroy the default loop */ /* you can actually call it at any time, anywhere :) */ void ev_default_fork (void); -int ev_method (EV_P); +unsigned int ev_method (EV_P); #endif #define EVLOOP_NONBLOCK 1 /* do not block/wait */ #define EVLOOP_ONESHOT 2 /* block *once* only */ -#define EVUNLOOP_ONCE 1 /* unloop once */ +#define EVUNLOOP_ONE 1 /* unloop once */ #define EVUNLOOP_ALL 2 /* unloop all loops */ #if EV_PROTOTYPES