--- libev/ev.h	2007/10/31 14:44:15	1.10
+++ libev/ev.h	2007/11/01 06:48:49	1.16
@@ -33,15 +33,18 @@
 typedef double ev_tstamp;
 
 /* eventmask, revents, events... */
-#define EV_UNDEF   -1 /* guaranteed to be invalid */
-#define EV_NONE    0x00
-#define EV_READ    0x01
-#define EV_WRITE   0x02
-#define EV_TIMEOUT 0x04
-#define EV_SIGNAL  0x08
-#define EV_IDLE    0x10
-#define EV_CHECK   0x20
-#define EV_ERROR   (0x3f|0x80)
+#define EV_UNDEF         -1 /* guaranteed to be invalid */
+#define EV_NONE        0x00
+#define EV_READ        0x01
+#define EV_WRITE       0x02
+#define EV_REIFY       0x04 /* private */
+#define EV_TIMEOUT 0x000100
+#define EV_SIGNAL  0x000200
+#define EV_IDLE    0x000400
+#define EV_CHECK   0x000800
+#define EV_PREPARE 0x001000
+#define EV_CHILD   0x002000
+#define EV_ERROR   0x800000 /* sent when an error occurs */
 
 /* can be used to add custom fields to all watchers */
 #ifndef EV_COMMON
@@ -51,6 +54,9 @@
 # define EV_PROTOTYPES 1
 #endif
 
+#define EV_VERSION_MAJOR 1
+#define EV_VERSION_MINOR 1
+
 /*
  * struct member types:
  * private: you can look at them, but not change them, and they might not mean anything to you.
@@ -127,18 +133,36 @@
   EV_WATCHER (ev_idle);
 };
 
-/* invoked for each run of the mainloop, just before the next blocking vall is initiated */
+/* invoked for each run of the mainloop, just before the blocking call */
+/* you can still change events in any way you like */
+struct ev_prepare
+{
+  EV_WATCHER (ev_prepare);
+};
+
+/* invoked for each run of the mainloop, just after the blocking call */
 struct ev_check
 {
   EV_WATCHER (ev_check);
 };
 
+/* invoked when sigchld is received and waitpid indicates the givne pid */
+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 */
+};
+
 #define EVMETHOD_NONE   0
 #define EVMETHOD_SELECT 1
 #define EVMETHOD_EPOLL  2
 #if EV_PROTOTYPES
 extern int ev_method;
 int ev_init (int flags); /* returns ev_method */
+int ev_version_major (void);
+int ev_version_minor (void);
 
 /* these three calls are suitable for plugging into pthread_atfork */
 void ev_prefork (void);
@@ -161,46 +185,56 @@
 #endif
 
 /* these may evaluate ev multiple times, and the other arguments at most once */
-/* either use evw_init + evXXX_set, or the evXXX_init macro, below, to first initialise a watcher */
-#define evw_init(ev,cb_)                   do { (ev)->active = 0; (ev)->pending = 0; (ev)->cb = (cb_); } while (0)
+/* either use ev_watcher_init + ev_TYPE_set, or the ev_TYPE_init macro, below, to first initialise a watcher */
+#define ev_watcher_init(ev,cb_)             do { (ev)->active = 0; (ev)->pending = 0; (ev)->cb = (cb_); } while (0)
 
-#define evio_set(ev,fd_,events_)           do { (ev)->fd = (fd_); (ev)->events = (events_); } while (0)
-#define evtimer_set(ev,after_,repeat_)     do { (ev)->at = (after_); (ev)->repeat = (repeat_); } while (0)
-#define evperiodic_set(ev,at_,interval_)   do { (ev)->at = (at_); (ev)->interval = (interval_); } while (0)
-#define evsignal_set(ev,signum_)           do { (ev)->signum = (signum_); } while (0)
-#define evcheck_set(ev)                    /* nop, yes, this is a serious in-joke */
-#define evidle_set(ev)                     /* nop, yes, this is a serious in-joke */
-
-#define evio_init(ev,cb,fd,events)         do { evw_init ((ev), (cb)); evio_set ((ev),(fd),(events)); } while (0)
-#define evtimer_init(ev,cb,after,repeat)   do { evw_init ((ev), (cb)); evtimer_set ((ev),(after),(repeat)); } while (0)
-#define evperiodic_init(ev,cb,at,interval) do { evw_init ((ev), (cb)); evperiodic_set ((ev),(at),(interval)); } while (0)
-#define evsignal_init(ev,cb,signum)        do { evw_init ((ev), (cb)); evsignal_set ((ev), (signum)); } while (0)
-#define evcheck_init(ev,cb)                do { evw_init ((ev), (cb)); evcheck_set ((ev)); } while (0)
-#define evidle_init(ev,cb)                 do { evw_init ((ev), (cb)); evidle_set ((ev)); } while (0)
+#define ev_io_set(ev,fd_,events_)           do { (ev)->fd = (fd_); (ev)->events = (events_); } while (0)
+#define ev_timer_set(ev,after_,repeat_)     do { (ev)->at = (after_); (ev)->repeat = (repeat_); } while (0)
+#define ev_periodic_set(ev,at_,interval_)   do { (ev)->at = (at_); (ev)->interval = (interval_); } while (0)
+#define ev_signal_set(ev,signum_)           do { (ev)->signum = (signum_); } while (0)
+#define ev_idle_set(ev)                     /* nop, yes, this is a serious in-joke */
+#define ev_prepare_set(ev)                  /* nop, yes, this is a serious in-joke */
+#define ev_check_set(ev)                    /* nop, yes, this is a serious in-joke */
+#define ev_child_set(ev,pid_)               do { (ev)->pid = (pid_); } while (0)
+
+#define ev_io_init(ev,cb,fd,events)         do { ev_watcher_init ((ev), (cb)); ev_io_set ((ev),(fd),(events)); } while (0)
+#define ev_timer_init(ev,cb,after,repeat)   do { ev_watcher_init ((ev), (cb)); ev_timer_set ((ev),(after),(repeat)); } while (0)
+#define ev_periodic_init(ev,cb,at,interval) do { ev_watcher_init ((ev), (cb)); ev_periodic_set ((ev),(at),(interval)); } while (0)
+#define ev_signal_init(ev,cb,signum)        do { ev_watcher_init ((ev), (cb)); ev_signal_set ((ev), (signum)); } while (0)
+#define ev_idle_init(ev,cb)                 do { ev_watcher_init ((ev), (cb)); ev_idle_set ((ev)); } while (0)
+#define ev_prepare_init(ev,cb)              do { ev_watcher_init ((ev), (cb)); ev_prepare_set ((ev)); } while (0)
+#define ev_check_init(ev,cb)                do { ev_watcher_init ((ev), (cb)); ev_check_set ((ev)); } while (0)
+#define ev_child_init(ev,cb,pid)            do { ev_watcher_init ((ev), (cb)); ev_child_set ((ev),(pid)); } while (0)
 
 #define ev_is_active(ev) (0 + (ev)->active) /* true when the watcher has been started */
 
 /* stopping (enabling, adding) a watcher does nothing if it is already running */
 /* stopping (disabling, deleting) a watcher does nothing unless its already running */
 #if EV_PROTOTYPES
-void evio_start       (struct ev_io *w);
-void evio_stop        (struct ev_io *w);
+void ev_io_start       (struct ev_io *w);
+void ev_io_stop        (struct ev_io *w);
+
+void ev_timer_start    (struct ev_timer *w);
+void ev_timer_stop     (struct ev_timer *w);
+void ev_timer_again    (struct ev_timer *w); /* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */
+
+void ev_periodic_start (struct ev_periodic *w);
+void ev_periodic_stop  (struct ev_periodic *w);
 
-void evtimer_start    (struct ev_timer *w);
-void evtimer_stop     (struct ev_timer *w);
-void evtimer_again    (struct ev_timer *w); /* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */
+void ev_signal_start   (struct ev_signal *w);
+void ev_signal_stop    (struct ev_signal *w);
 
-void evperiodic_start (struct ev_periodic *w);
-void evperiodic_stop  (struct ev_periodic *w);
+void ev_idle_start     (struct ev_idle *w);
+void ev_idle_stop      (struct ev_idle *w);
 
-void evsignal_start   (struct ev_signal *w);
-void evsignal_stop    (struct ev_signal *w);
+void ev_prepare_start  (struct ev_prepare *w);
+void ev_prepare_stop   (struct ev_prepare *w);
 
-void evidle_start     (struct ev_idle *w);
-void evidle_stop      (struct ev_idle *w);
+void ev_check_start    (struct ev_check *w);
+void ev_check_stop     (struct ev_check *w);
 
-void evcheck_start    (struct ev_check *w);
-void evcheck_stop     (struct ev_check *w);
+void ev_child_start    (struct ev_child *w);
+void ev_child_stop     (struct ev_child *w);
 #endif
 
 #endif