--- libev/ev_select.c	2009/01/06 19:46:56	1.40
+++ libev/ev_select.c	2011/01/31 00:49:26	1.51
@@ -1,7 +1,7 @@
 /*
  * libev select fd activity backend
  *
- * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -39,8 +39,11 @@
 
 #ifndef _WIN32
 /* for unix systems */
-# include <sys/select.h>
 # include <inttypes.h>
+# ifndef __hpux
+/* for REAL unix systems */
+#  include <sys/select.h>
+# endif
 #endif
 
 #ifndef EV_SELECT_USE_FD_SET
@@ -72,7 +75,6 @@
 
   {
 #if EV_SELECT_USE_FD_SET
-    assert (("libev: fd >= FD_SETSIZE passed to fd_set-based select backend", fd < FD_SETSIZE));
 
     #if EV_SELECT_IS_WINSOCKET
     SOCKET handle = anfds [fd].handle;
@@ -80,6 +82,8 @@
     int handle = fd;
     #endif
 
+    assert (("libev: fd >= FD_SETSIZE passed to fd_set-based select backend", fd < FD_SETSIZE));
+
     /* FD_SET is broken on windows (it adds the fd to a set twice or more,
      * which eventually leads to overflows). Need to call it only on changes.
      */
@@ -139,8 +143,8 @@
   int res;
   int fd_setsize;
 
-  tv.tv_sec  = (long)timeout;
-  tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
+  EV_RELEASE_CB;
+  EV_TV_SET (tv, timeout);
 
 #if EV_SELECT_USE_FD_SET
   fd_setsize = sizeof (fd_set);
@@ -165,6 +169,7 @@
 #else
   res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
 #endif
+  EV_ACQUIRE_CB;
 
   if (expect_false (res < 0))
     {
@@ -181,7 +186,7 @@
       #endif
 
       #ifdef _WIN32
-      /* select on windows errornously returns EINVAL when no fd sets have been
+      /* select on windows erroneously returns EINVAL when no fd sets have been
        * provided (this is documented). what microsoft doesn't tell you that this bug
        * exists even when the fd sets _are_ provided, so we have to check for this bug
        * here and emulate by sleeping manually.
@@ -279,9 +284,12 @@
 #else
   vec_max = 0;
   vec_ri  = 0; 
-  vec_ri  = 0;   
-  vec_wo  = 0; 
+  vec_ro  = 0;   
+  vec_wi  = 0; 
   vec_wo  = 0; 
+  #ifdef _WIN32
+  vec_eo  = 0;
+  #endif
 #endif
 
   return EVBACKEND_SELECT;
@@ -294,6 +302,9 @@
   ev_free (vec_ro);
   ev_free (vec_wi);
   ev_free (vec_wo);
+  #ifdef _WIN32
+  ev_free (vec_eo);
+  #endif
 }