*** empty log message ***

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index 4e4c378e0c029f8fc7265bea18c0d9313c55c8a5..f2ec3f2e7be4198a412602c32c336c610d90fc82 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


@@ -233,7 +233,7 @@ union ev_any_watcher
 
 /* bits for ev_default_loop and ev_loop_new */
 /* the default */
 
 /* 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 */
 
 /* method bits to be ored together */
 #define EVMETHOD_SELECT  0x00000001 /* about anywhere */


@@ -244,7 +244,7 @@ union ev_any_watcher
 #define EVMETHOD_PORT    0x00000020 /* solaris 10 */ /* NYI */
 
 /* flag bits */
 #define EVMETHOD_PORT    0x00000020 /* solaris 10 */ /* NYI */
 
 /* 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);
 
 #if EV_PROTOTYPES
 int ev_version_major (void);


@@ -280,7 +280,7 @@ ev_tstamp ev_now (EV_P); /* time w.r.t. timers and the eventloop, updated after
 
 # else
 
 
 # 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)
 
 static ev_tstamp
 ev_now (void)


@@ -298,12 +298,12 @@ void ev_default_destroy (void); /* destroy the default loop */
 /* you can actually call it at any time, anywhere :) */
 void ev_default_fork (void);
 
 /* 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 */
 #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
 #define EVUNLOOP_ALL    2 /* unloop all loops */
 
 #if EV_PROTOTYPES