This reverts commit ae09fae8a6b43299a628ae0989fe2fedb924d560. Commit ae09fae8a6b432 caused segfaults while running unit tests on Windows as pollfd.fd on Windows does not take negative values.
Signed-off-by: Gurucharan Shetty <[email protected]> --- This patch has already been applied and is just a FYI. --- AUTHORS | 2 -- lib/poll-loop.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index cba0535..6e5bbab 100644 --- a/AUTHORS +++ b/AUTHORS @@ -80,7 +80,6 @@ Hao Zheng [email protected] Helmut Schaa [email protected] Huanle Han [email protected] Ian Campbell [email protected] -Ilya Maximets [email protected] Isaku Yamahata [email protected] James P. [email protected] James Page [email protected] @@ -328,7 +327,6 @@ Mikael Doverhag [email protected] Mrinmoy Das [email protected] Nagi Reddy Jonnala [email protected] Niels van Adrichem [email protected] -Nikita Kalyazin [email protected] Niklas Andersson [email protected] Pankaj Thakkar [email protected] Pasi Kärkkäinen [email protected] diff --git a/lib/poll-loop.c b/lib/poll-loop.c index 36eb5ac..3c4b55c 100644 --- a/lib/poll-loop.c +++ b/lib/poll-loop.c @@ -104,7 +104,7 @@ poll_create_node(int fd, HANDLE wevent, short int events, const char *where) COVERAGE_INC(poll_create_node); /* Both 'fd' and 'wevent' cannot be set. */ - ovs_assert(fd == -1 || !wevent); + ovs_assert(!fd != !wevent); /* Check for duplicate. If found, "or" the events. */ node = find_poll_node(loop, fd, wevent); @@ -159,7 +159,7 @@ poll_fd_wait_at(int fd, short int events, const char *where) void poll_wevent_wait_at(HANDLE wevent, const char *where) { - poll_create_node(-1, wevent, 0, where); + poll_create_node(0, wevent, 0, where); } #endif /* _WIN32 */ -- 1.7.9.5 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
