--- EV/EV.xs	2007/11/03 10:37:28	1.46
+++ EV/EV.xs	2007/11/03 21:58:51	1.47
@@ -5,11 +5,17 @@
 /*#include <netinet/in.h>*/
 
 #define EV_PROTOTYPES 1
+#define EV_STANDALONE 1
 #include "EV/EVAPI.h"
 
 #include "libev/ev.c"
 #include "libev/event.h"
 #include "libev/event.c"
+#define DNS_USE_GETTIMEOFDAY_FOR_ID 1
+#define HAVE_STRUCT_IN6_ADDR 1
+#undef HAVE_STRTOK_R
+#undef strtok_r
+#define strtok_r fake_strtok_r
 #include "libev/evdns.c"
 
 typedef int Signal;
@@ -284,9 +290,9 @@
     evapi.rev            = EV_API_REVISION;
     evapi.sv_fileno      = sv_fileno;
     evapi.sv_signum      = sv_signum;
-    evapi.now            = &ev_now;
-    evapi.method         = &ev_method;
-    evapi.loop_done      = &ev_loop_done;
+    evapi.now            = ev_now;
+    evapi.method         = ev_method;
+    evapi.unloop         = ev_unloop;
     evapi.time           = ev_time;
     evapi.loop           = ev_loop;
     evapi.once           = ev_once;
@@ -316,16 +322,8 @@
 }
 
 NV ev_now ()
-	CODE:
-        RETVAL = ev_now;
-	OUTPUT:
-        RETVAL
 
 int ev_method ()
-	CODE:
-        RETVAL = ev_method;
-	OUTPUT:
-        RETVAL
 
 NV ev_time ()
 
@@ -333,9 +331,7 @@
 
 void ev_loop (int flags = 0)
 
-void ev_loop_done (int value = 1)
-	CODE:
-        ev_loop_done = value;
+void ev_unloop (int how = 1)
 
 struct ev_io *io (SV *fh, int events, SV *cb)
 	ALIAS: