try to programmatically integrate libevent

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index c3692dd5bab87e404fd315f8f966fd4bce48e0c4..bcb18e466368d18aee36481f7f1b2378f4e44c0c 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -86,7 +86,7 @@ typedef double ev_tstamp;
 
 #define EV_WATCHER_LIST(type)                  \
   EV_WATCHER (type);                           \
-  struct type *next /* private */
+  struct ev_watcher_list *next /* private */
 
 #define EV_WATCHER_TIME(type)                  \
   EV_WATCHER (type);                           \
@@ -168,19 +168,24 @@ struct ev_check
 
 /* invoked when sigchld is received and waitpid indicates the givne pid */
 /* revent EV_CHILD */
+/* does not support priorities */
 struct ev_child
 {
   EV_WATCHER_LIST (ev_child);
 
-  int pid;    /* ro */
-  int status; /* rw, holds the exit status, use the macros from sys/wait.h */
+  int pid;     /* ro */
+  int rpid;    /* rw, holds the received pid */
+  int rstatus; /* rw, holds the exit status, use the macros from sys/wait.h */
 };
 
-#define EVMETHOD_AUTO   0 /* consults environment */
-#define EVMETHOD_SELECT 1
-#define EVMETHOD_POLL   2
-#define EVMETHOD_EPOLL  4
-#define EVMETHOD_ANY    ~0 /* any method, do not consult env */
+#define EVMETHOD_AUTO     0 /* consults environment */
+#define EVMETHOD_SELECT   1
+#define EVMETHOD_POLL     2
+#define EVMETHOD_EPOLL    4
+#define EVMETHOD_KQUEUE   8
+#define EVMETHOD_DEVPOLL 16 /* NYI */
+#define EVMETHOD_PORT    32 /* NYI */
+#define EVMETHOD_ANY     ~0 /* any method, do not consult env */
 #if EV_PROTOTYPES
 extern int ev_method;
 int ev_init (int methods); /* returns ev_method */