Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

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

diff --git a/src/poll.c b/src/poll.c
index a2f2c90..8c9e354 100644 (file)
--- a/src/poll.c
+++ b/src/poll.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: poll.c,v 1.4 2007-11-30 11:44:47 adam Exp $
  */
 /**
  * \file 
@@ -140,8 +138,10 @@ int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
                     yaz_poll_add(mask, yaz_poll_read);
                 if (pollfds[i].revents & POLLOUT)
                     yaz_poll_add(mask, yaz_poll_write);
-                if (pollfds[i].revents & POLLERR)
+                if (pollfds[i].revents & ~(POLLIN | POLLOUT))
+                {
                     yaz_poll_add(mask, yaz_poll_except);
+                }
             }
             fds[i].output_mask = mask;
         }
@@ -163,6 +163,7 @@ int yaz_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab