--- libev/ev_vars.h	2009/07/10 00:36:21	1.35
+++ libev/ev_vars.h	2009/07/10 19:10:19	1.36
@@ -48,7 +48,7 @@
 
 VARx(int, backend)
 VARx(int, activecnt) /* total number of active events ("refcount") */
-VARx(char, loop_done)  /* signal by ev_unloop */
+VARx(unsigned char, loop_done)  /* signal by ev_unloop */
 
 VARx(int, backend_fd)
 VARx(ev_tstamp, backend_fudge) /* assumed typical timer resolution */
@@ -166,16 +166,13 @@
 VAR (fs_hash, ANFS fs_hash [EV_INOTIFY_HASHSIZE])
 #endif
 
-#if EV_MINIMAL < 2
+#if EV_MINIMAL < 2 || EV_GENWRAP
 VARx(unsigned int, loop_count) /* total number of loop iterations/blocks */
 VARx(unsigned int, loop_depth) /* #ev_loop enters - #ev_loop leaves */
 
 VARx(void *, userdata)
-#endif
-
-#if EV_MINIMAL < 2
-VAR (suspend_cb, void (*suspend_cb)(EV_P))
-VAR (resume_cb , void (*resume_cb) (EV_P))
+VAR (release_cb, void (*release_cb)(EV_P))
+VAR (acquire_cb, void (*acquire_cb)(EV_P))
 VAR (invoke_cb , void (*invoke_cb) (EV_P))
 #endif