--- libev/ev_vars.h	2007/11/04 00:24:17	1.2
+++ libev/ev_vars.h	2007/12/03 13:41:25	1.17
@@ -2,21 +2,27 @@
 
 VARx(ev_tstamp, now_floor) /* last time we refreshed rt_time */
 VARx(ev_tstamp, mn_now)    /* monotonic clock "now" */
-VARx(ev_tstamp, rt_now)
-VARx(ev_tstamp, rtmn_diff)      /* difference realtime - monotonic time */
-VARx(int, method)
-
-VARx(ev_tstamp, method_fudge) /* assumed typical timer resolution */
-VAR (method_modify, void (*method_modify)(EV_P_ int fd, int oev, int nev))
-VAR (method_poll  , void (*method_poll)(EV_P_ ev_tstamp timeout))
+VARx(ev_tstamp, rtmn_diff) /* difference realtime - monotonic time */
+VARx(int, backend)
+VARx(int, activecnt) /* total number of active events ("refcount") */
+VARx(unsigned int, loop_count); /* total number of loop iterations/blocks */
+
+VARx(ev_tstamp, backend_fudge) /* assumed typical timer resolution */
+VAR (backend_modify, void (*backend_modify)(EV_P_ int fd, int oev, int nev))
+VAR (backend_poll  , void (*backend_poll)(EV_P_ ev_tstamp timeout))
+VARx(int, backend_fd)
 
-VARx(int, activecnt) /* number of active events */
+#if !defined(_WIN32) || EV_GENWRAP
+VARx(pid_t, curpid)
+#endif
+
+VARx(int, postfork)  /* true if we need to recreate kernel state after fork */
 
 #if EV_USE_SELECT || EV_GENWRAP
-VARx(unsigned char *, vec_ri)
-VARx(unsigned char *, vec_ro)
-VARx(unsigned char *, vec_wi)
-VARx(unsigned char *, vec_wo)
+VARx(void *, vec_ri)
+VARx(void *, vec_ro)
+VARx(void *, vec_wi)
+VARx(void *, vec_wo)
 VARx(int, vec_max)
 #endif
 
@@ -29,14 +35,11 @@
 #endif
 
 #if EV_USE_EPOLL || EV_GENWRAP
-VARx(int, epoll_fd)
-
 VARx(struct epoll_event *, epoll_events)
 VARx(int, epoll_eventmax)
 #endif
 
 #if EV_USE_KQUEUE || EV_GENWRAP
-VARx(int, kqueue_fd)
 VARx(struct kevent *, kqueue_changes)
 VARx(int, kqueue_changemax)
 VARx(int, kqueue_changecnt)
@@ -44,6 +47,11 @@
 VARx(int, kqueue_eventmax)
 #endif
 
+#if EV_USE_PORT || EV_GENWRAP
+VARx(struct port_event *, port_events)
+VARx(int, port_eventmax)
+#endif
+
 VARx(ANFD *, anfds)
 VARx(int, anfdmax)
 
@@ -59,9 +67,11 @@
 VARx(int, timermax)
 VARx(int, timercnt)
 
+#if EV_PERIODIC_ENABLE || EV_GENWRAP
 VARx(struct ev_periodic **, periodics)
 VARx(int, periodicmax)
 VARx(int, periodiccnt)
+#endif
 
 VARx(struct ev_idle **, idles)
 VARx(int, idlemax)
@@ -75,10 +85,17 @@
 VARx(int, checkmax)
 VARx(int, checkcnt)
 
-VAR (childs, struct ev_child *childs [PID_HASHSIZE])
-VARx(struct ev_signal, childev)
+#if EV_FORK_ENABLE || EV_GENWRAP
+VARx(struct ev_fork **, forks)
+VARx(int, forkmax)
+VARx(int, forkcnt)
+#endif
 
-VARx(struct ev_io, sigev)
+#if EV_USE_INOTIFY || EV_GENWRAP
+VARx(int, fs_fd)
+VARx(ev_io, fs_w)
+VAR (fs_hash, ANFS fs_hash [EV_INOTIFY_HASHSIZE])
+#endif
 
 #undef VARx