--- EV/EV.xs	2007/11/05 21:43:17	1.53
+++ EV/EV.xs	2007/11/07 13:27:56	1.58
@@ -7,15 +7,30 @@
 #define EV_PROTOTYPES 1
 #include "EV/EVAPI.h"
 
+/* fix perl api breakage */
+#undef signal
+#undef sigaction
+
+#define EV_SELECT_USE_WIN32_HANDLES 0
+#define EV_SELECT_USE_FD_SET 0
 /* due to bugs in OS X we have to use libev/ explicitly here */
 #include "libev/ev.c"
 #include "event.c"
+
+#ifndef WIN32
 #define DNS_USE_GETTIMEOFDAY_FOR_ID 1
-#define HAVE_STRUCT_IN6_ADDR 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;
 
@@ -96,10 +111,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;
@@ -169,6 +184,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // DNS
 
+#ifndef WIN32
 static void
 dns_cb (int result, char type, int count, int ttl, void *addresses, void *arg)
 {
@@ -217,6 +233,7 @@
 
   LEAVE;
 }
+#endif
 
 #define CHECK_REPEAT(repeat) if (repeat < 0.) \
   croak (# repeat " value must be >= 0");
@@ -233,7 +250,6 @@
 
 BOOT:
 {
-  int i;
   HV *stash = gv_stashpv ("EV", 1);
 
   static const struct {
@@ -316,8 +332,9 @@
     sv_setiv (sv, (IV)&evapi);
     SvREADONLY_on (sv);
   }
-
+#ifndef WIN32
   pthread_atfork (0, 0, ev_default_fork);
+#endif
 }
 
 NV ev_now ()
@@ -719,6 +736,8 @@
 	OUTPUT:
         RETVAL
 
+#ifndef WIN32
+
 MODULE = EV		PACKAGE = EV::DNS	PREFIX = evdns_
 
 BOOT:
@@ -852,6 +871,7 @@
 
 #endif
 
+#endif