--- cvsroot/EV/EV.xs	2007/11/04 16:43:53	1.49
+++ cvsroot/EV/EV.xs	2007/11/06 12:36:25	1.55
@@ -7,15 +7,21 @@
 #define EV_PROTOTYPES 1
 #include "EV/EVAPI.h"
 
+/* 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 "event.c"
 #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 "libev/evdns.c"
+#include "evdns.c"
+
+#ifndef WIN32
+# include <pthread.h>
+#endif
 
 typedef int Signal;
 
@@ -317,7 +323,9 @@
     SvREADONLY_on (sv);
   }
 
-  pthread_atfork (0, 0, ev_default_fork);
+  #ifndef WIN32
+    pthread_atfork (0, 0, ev_default_fork);
+  #endif
 }
 
 NV ev_now ()
@@ -326,7 +334,7 @@
 
 NV ev_time ()
 
-int ev_init (int methods = EVMETHOD_AUTO)
+int ev_default_loop (int methods = EVMETHOD_AUTO)
 
 void ev_loop (int flags = 0)
 
@@ -583,8 +591,6 @@
 	OUTPUT:
         RETVAL
 
-MODULE = EV		PACKAGE = EV::Time
-
 MODULE = EV		PACKAGE = EV::Timer	PREFIX = ev_timer_
 
 void ev_timer_start (struct ev_timer *w)