--- cvsroot/EV/EV.xs	2007/11/03 21:58:51	1.47
+++ cvsroot/EV/EV.xs	2007/11/05 21:43:17	1.53
@@ -5,18 +5,17 @@
 /*#include <netinet/in.h>*/
 
 #define EV_PROTOTYPES 1
-#define EV_STANDALONE 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
 #undef HAVE_STRTOK_R
 #undef strtok_r
 #define strtok_r fake_strtok_r
-#include "libev/evdns.c"
+#include "evdns.c"
 
 typedef int Signal;
 
@@ -318,7 +317,7 @@
     SvREADONLY_on (sv);
   }
 
-  pthread_atfork (ev_fork_prepare, ev_fork_parent, ev_fork_child);
+  pthread_atfork (0, 0, ev_default_fork);
 }
 
 NV ev_now ()
@@ -327,7 +326,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)
 
@@ -584,8 +583,6 @@
 	OUTPUT:
         RETVAL
 
-MODULE = EV		PACKAGE = EV::Time
-
 MODULE = EV		PACKAGE = EV::Timer	PREFIX = ev_timer_
 
 void ev_timer_start (struct ev_timer *w)