--- cvsroot/EV/EV.xs	2010/10/24 19:01:01	1.145
+++ cvsroot/EV/EV.xs	2010/10/29 19:06:03	1.148
@@ -343,6 +343,12 @@
 #define CHECK_SIG(sv,num) if ((num) < 0) \
   croak ("illegal signal number or name: %s", SvPV_nolen (sv));
 
+static void
+default_fork (void)
+{
+  ev_loop_fork (EV_DEFAULT_UC);
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // XS interface functions
 
@@ -367,7 +373,7 @@
     const_iv (EV_, READ)
     const_iv (EV_, WRITE)
     const_iv (EV_, IO)
-    const_iv (EV_, TIMEOUT)
+    const_iv (EV_, TIMER)
     const_iv (EV_, PERIODIC)
     const_iv (EV_, SIGNAL)
     const_iv (EV_, CHILD)
@@ -399,17 +405,15 @@
     const_iv (EV, FLAG_FORKCHECK)
     const_iv (EV, FLAG_SIGNALFD)
     const_iv (EV, FLAG_NOENV)
-    const_iv (EV, FLAG_NOSIGFD) /* compatibility, always 0 */
     const_iv (EV, FLAG_NOINOTIFY)
 
     const_iv (EV_, VERSION_MAJOR)
     const_iv (EV_, VERSION_MINOR)
 #if EV_COMPAT3
-    const_iv (EV_, TIMER)
-
+    const_iv (EV, FLAG_NOSIGFD) /* compatibility, always 0 */
+    const_iv (EV_, TIMEOUT)
     const_iv (EV, LOOP_NONBLOCK)
     const_iv (EV, LOOP_ONESHOT)
-
     const_iv (EV, UNLOOP_CANCEL)
     const_iv (EV, UNLOOP_ONE)
     const_iv (EV, UNLOOP_ALL)
@@ -511,7 +515,7 @@
     SvREADONLY_on (sv);
   }
 #if !defined(_WIN32) && !defined(_MINIX)
-  pthread_atfork (0, 0, ev_default_fork);
+  pthread_atfork (0, 0, default_fork);
 #endif
 }
 
@@ -1134,6 +1138,12 @@
         STOP (cleanup, w);
         e_destroy (w);
 
+int keepalive (ev_watcher *w, int new_value = 0)
+	CODE:
+        RETVAL = 0;
+	OUTPUT:
+        RETVAL
+
 MODULE = EV		PACKAGE = EV::Child	PREFIX = ev_child_
 
 #if EV_CHILD_ENABLE