From: Ben Pfaff <blp@nicira.com>
Date: Wed, 4 Jun 2014 22:47:16 +0000 (-0700)
Subject: poll-loop: Ignore 'wevent' in poll_fd_wait_at() on non-Windows.
X-Git-Tag: v2.3~66
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=570817ba0ffd79c3e61f6d88fc1a5812399f642b

poll-loop: Ignore 'wevent' in poll_fd_wait_at() on non-Windows.

'wevent' isn't actually used on non-Windows systems, but poll_fd_wait_at()
and find_poll_node() treat events with different 'wevent' as different, so
it seems better to make sure that 'wevent' doesn't matter.

Alternatively, one could ovs_assert(!wevent).  I guess that would catch
a caller accidentally swapping the 'fd' and 'wevent' arguments.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Gurucharan Shetty <gshetty@nicira.com>
---

diff --git a/lib/poll-loop.c b/lib/poll-loop.c
index 510903e46..788fd1614 100644
--- a/lib/poll-loop.c
+++ b/lib/poll-loop.c
@@ -106,6 +106,8 @@ poll_fd_wait_at(int fd, HANDLE wevent, short int events, const char *where)
         VLOG_ERR("No event to wait fd %d", fd);
         return;
     }
+#else
+    wevent = 0;
 #endif
 
     /* Check for duplicate.  If found, "or" the event. */