--- cvsroot/EV/EV.xs	2007/11/12 00:31:08	1.64
+++ cvsroot/EV/EV.xs	2007/11/23 05:00:44	1.73
@@ -169,7 +169,6 @@
 
   PUTBACK;
   call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
-  SP = PL_stack_base + mark; PUTBACK;
 
   SvREFCNT_dec (sv_self);
   SvREFCNT_dec (sv_status);
@@ -184,8 +183,10 @@
       PUSHMARK (SP);
       PUTBACK;
       call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
-      SP = PL_stack_base + mark; PUTBACK;
     }
+
+  SP = PL_stack_base + mark;
+  PUTBACK;
 }
 
 static ev_tstamp
@@ -322,15 +323,17 @@
 
     const_iv (EV, LOOP_ONESHOT)
     const_iv (EV, LOOP_NONBLOCK)
+    const_iv (EV, UNLOOP_ONE)
+    const_iv (EV, UNLOOP_ALL)
 
-    const_iv (EV, METHOD_AUTO)
-    const_iv (EV, METHOD_SELECT)
-    const_iv (EV, METHOD_POLL)
-    const_iv (EV, METHOD_EPOLL)
-    const_iv (EV, METHOD_KQUEUE)
-    const_iv (EV, METHOD_DEVPOLL)
-    const_iv (EV, METHOD_PORT)
-    const_iv (EV, METHOD_ANY)
+    const_iv (EV, BACKEND_SELECT)
+    const_iv (EV, BACKEND_POLL)
+    const_iv (EV, BACKEND_EPOLL)
+    const_iv (EV, BACKEND_KQUEUE)
+    const_iv (EV, BACKEND_DEVPOLL)
+    const_iv (EV, BACKEND_PORT)
+    const_iv (EV, FLAG_AUTO)
+    const_iv (EV, FLAG_NOENV)
   };
 
   for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
@@ -356,7 +359,7 @@
     evapi.sv_fileno      = sv_fileno;
     evapi.sv_signum      = sv_signum;
     evapi.now            = ev_now;
-    evapi.method         = ev_method;
+    evapi.backend        = ev_backend;
     evapi.unloop         = ev_unloop;
     evapi.time           = ev_time;
     evapi.loop           = ev_loop;
@@ -393,7 +396,7 @@
 
 NV ev_time ()
 
-int ev_default_loop (int methods = EVMETHOD_AUTO)
+int ev_default_loop (int methods = ev_supported_methods ())
 
 void ev_loop (int flags = 0)
 
@@ -486,7 +489,7 @@
 
 struct ev_child *child (int pid, SV *cb)
 	ALIAS:
-        check_ns = 1
+        child_ns = 1
 	CODE:
         RETVAL = e_new (sizeof (struct ev_child), cb);
         ev_child_set (RETVAL, pid);