--- cvsroot/EV/EV.xs	2007/11/01 12:11:07	1.34
+++ cvsroot/EV/EV.xs	2007/11/01 17:45:30	1.38
@@ -4,13 +4,13 @@
 
 /*#include <netinet/in.h>*/
 
-#define TIMEOUT_NONE HUGE_VAL
-#define EV_USE_EPOLL 1
-
 #define EV_PROTOTYPES 1
 #include "EV/EVAPI.h"
 
 #include "libev/ev.c"
+#include "libev/event.h"
+#include "libev/event.c"
+#include "libev/evdns.c"
 
 typedef int Signal;
 
@@ -158,7 +158,6 @@
     }
 }
 
-#if 0
 /////////////////////////////////////////////////////////////////////////////
 // DNS
 
@@ -210,7 +209,6 @@
 
   LEAVE;
 }
-#endif
 
 #define CHECK_REPEAT(repeat) if (repeat < 0.) \
   croak (# repeat " value must be >= 0");
@@ -485,7 +483,7 @@
 	OUTPUT:
         RETVAL
 
-short events (struct ev_io *w, short new_events = EV_UNDEF)
+int events (struct ev_io *w, int new_events = EV_UNDEF)
 	CODE:
 {
         RETVAL = w->events;
@@ -638,8 +636,6 @@
 	OUTPUT:
         RETVAL
 
-#if 0
-
 MODULE = EV		PACKAGE = EV::DNS	PREFIX = evdns_
 
 BOOT:
@@ -731,6 +727,7 @@
 
 void evdns_search_ndots_set (int ndots)
 
+#if 0
 
 MODULE = EV		PACKAGE = EV::HTTP	PREFIX = evhttp_