sockets: fix for whether poll is available

[yaz-moved-to-github.git] / src / poll.c

diff --git a/src/poll.c b/src/poll.c
index 70679f6..f3584d7 100644 (file)
--- a/src/poll.c
+++ b/src/poll.c
@@ -1,11 +1,14 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
 /**
  * \file 
  * \brief Select, poll wrapper
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <assert.h>
 #include <string.h>
@@ -63,6 +66,10 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
         enum yaz_poll_mask mask = fds[i].input_mask;
         int fd = fds[i].fd;
 
+        /* Timeout events */
+        if (fd < 0)
+            continue;
+
         if (mask & yaz_poll_read)
             FD_SET(fd, &input);
         if (mask & yaz_poll_write)
@@ -84,8 +91,7 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
             int fd = fds[i].fd;
             if (!r)
                 yaz_poll_add(mask, yaz_poll_timeout);
-            else
-            {
+            else if (fd >= 0) {
                 if (FD_ISSET(fd, &input))
                     yaz_poll_add(mask, yaz_poll_read);
                 if (FD_ISSET(fd, &output))
@@ -153,7 +159,7 @@ int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 
 int yaz_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 {
-#if YAZ_HAVE_SYS_POLL_H
+#if HAVE_SYS_POLL_H
     return yaz_poll_poll(fds, num_fds, sec, nsec);
 #else
     return yaz_poll_select(fds, num_fds, sec, nsec);