--- cvsroot/EV/EV.xs	2007/11/03 10:37:28	1.46
+++ cvsroot/EV/EV.xs	2007/11/06 17:20:42	1.57
@@ -7,10 +7,28 @@
 #define EV_PROTOTYPES 1
 #include "EV/EVAPI.h"
 
+/* fix perl api breakage */
+#undef signal
+#undef sigaction
+
+/* due to bugs in OS X we have to use libev/ explicitly here */
 #include "libev/ev.c"
-#include "libev/event.h"
-#include "libev/event.c"
-#include "libev/evdns.c"
+#include "event.c"
+
+#ifndef WIN32
+#define DNS_USE_GETTIMEOFDAY_FOR_ID 1
+#if !defined (WIN32) && !defined(__CYGWIN__)
+# define HAVE_STRUCT_IN6_ADDR 1
+#endif
+#undef HAVE_STRTOK_R
+#undef strtok_r
+#define strtok_r fake_strtok_r
+#include "evdns.c"
+#endif
+
+#ifndef WIN32
+# include <pthread.h>
+#endif
 
 typedef int Signal;
 
@@ -91,10 +109,10 @@
   return (void *)w;
 }
 
-static void *
+static void
 e_destroy (void *w_)
 {
-  struct ev_watcher *w = w_;
+  struct ev_watcher *w = (struct ev_watcher *)w_;
 
   SvREFCNT_dec (w->fh   ); w->fh    = 0;
   SvREFCNT_dec (w->cb_sv); w->cb_sv = 0;
@@ -164,6 +182,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // DNS
 
+#ifndef WIN32
 static void
 dns_cb (int result, char type, int count, int ttl, void *addresses, void *arg)
 {
@@ -212,6 +231,7 @@
 
   LEAVE;
 }
+#endif
 
 #define CHECK_REPEAT(repeat) if (repeat < 0.) \
   croak (# repeat " value must be >= 0");
@@ -228,7 +248,6 @@
 
 BOOT:
 {
-  int i;
   HV *stash = gv_stashpv ("EV", 1);
 
   static const struct {
@@ -284,9 +303,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;
@@ -311,31 +330,22 @@
     sv_setiv (sv, (IV)&evapi);
     SvREADONLY_on (sv);
   }
-
-  pthread_atfork (ev_fork_prepare, ev_fork_parent, ev_fork_child);
+#ifndef WIN32
+  pthread_atfork (0, 0, ev_default_fork);
+#endif
 }
 
 NV ev_now ()
-	CODE:
-        RETVAL = ev_now;
-	OUTPUT:
-        RETVAL
 
 int ev_method ()
-	CODE:
-        RETVAL = ev_method;
-	OUTPUT:
-        RETVAL
 
 NV ev_time ()
 
-int ev_init (int methods = EVMETHOD_AUTO)
+int ev_default_loop (int methods = EVMETHOD_AUTO)
 
 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:
@@ -588,8 +598,6 @@
 	OUTPUT:
         RETVAL
 
-MODULE = EV		PACKAGE = EV::Time
-
 MODULE = EV		PACKAGE = EV::Timer	PREFIX = ev_timer_
 
 void ev_timer_start (struct ev_timer *w)
@@ -726,6 +734,8 @@
 	OUTPUT:
         RETVAL
 
+#ifndef WIN32
+
 MODULE = EV		PACKAGE = EV::DNS	PREFIX = evdns_
 
 BOOT:
@@ -859,6 +869,7 @@
 
 #endif
 
+#endif