*** empty log message ***

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index 111be8ecdcf4bc435309e6b500d84c88a4c0ea2b..384df3e0bcc31becc1f77aa0f53fe1cfaa592e19 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -203,7 +203,7 @@ struct ev_check
   EV_WATCHER (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
 /* revent EV_CHILD */
 /* does not support priorities */
 struct ev_child


@@ -241,7 +241,7 @@ union ev_any_watcher
 #define EVMETHOD_EPOLL   0x00000004 /* linux */
 #define EVMETHOD_KQUEUE  0x00000008 /* bsd */
 #define EVMETHOD_DEVPOLL 0x00000010 /* solaris 8 */ /* NYI */
 #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 EVFLAG_NOENV     0x01000000 /* do NOT consult environment */
 
 /* flag bits */
 #define EVFLAG_NOENV     0x01000000 /* do NOT consult environment */


@@ -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 */
 # 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);
 
 /* create and destroy alternative loops that don't handle signals */
 struct ev_loop *ev_loop_new (unsigned int flags);


@@ -303,7 +313,7 @@ unsigned int ev_method (EV_P);
 
 #define EVLOOP_NONBLOCK        1 /* do not block/wait */
 #define EVLOOP_ONESHOT 2 /* block *once* only */
 
 #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
 #define EVUNLOOP_ALL    2 /* unloop all loops */
 
 #if EV_PROTOTYPES