X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.c;h=2764c924601c5b7d9cdc945346029cfbbbe6f306;hb=3b792849c676d96918850e2f1e0af87a75278501;hp=a641326754faaaa321876f94951d81e457725147;hpb=071b5ca306efc84b1b22e071c4e03b31fb9fe17a;p=yaz-moved-to-github.git

diff --git a/src/eventl.c b/src/eventl.c
index a641326..2764c92 100644
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: eventl.c,v 1.13 2007-11-09 18:49:19 adam Exp $
+ * $Id: eventl.c,v 1.15 2007-11-09 22:08:14 adam Exp $
  */
 
 /**
@@ -64,22 +64,12 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, int chan_id)
 
 int iochan_is_alive(IOCHAN chan)
 {
-    static struct timeval to;
-    fd_set in, out, except;
-    int res, max;
+    struct yaz_poll_fd fds;
+    int res;
 
-    to.tv_sec = 0;
-    to.tv_usec = 0;
-
-    FD_ZERO(&in);
-    FD_ZERO(&out);
-    FD_ZERO(&except);
-
-    FD_SET(chan->fd, &in);
-
-    max = chan->fd + 1;
-
-    res = YAZ_EV_SELECT(max + 1, &in, 0, 0, &to);
+    fds.fd = chan->fd;
+    fds.input_mask = yaz_poll_read;
+    res = yaz_poll(&fds, 1, 0, 0);
     if (res == 0)
         return 1;
     if (!ir_read(chan, EVENT_INPUT))
@@ -134,7 +124,7 @@ int event_loop(IOCHAN *iochans)
             fds[i].fd = p->fd;
             fds[i].input_mask = input_mask;
         }
-        res = yaz_poll(fds, no_fds, tv_sec);
+        res = yaz_poll(fds, no_fds, tv_sec, 0);
         if (res < 0)
         {
             if (yaz_errno() == EINTR)