From 8898223d74820470c756fa6c15a2f0a397c51895 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 11 May 2017 16:31:25 +0200 Subject: [PATCH] poll: Fix confusion between SOCKETs and FDs on native Windows. Fix proposed by Daniel P. Berrange . * lib/poll.c [WINDOWS_NATIVE]: Undefine select. --- ChangeLog | 6 ++++++ lib/poll.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index f5f34cc62c..a7f9c88f01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-05-11 Bruno Haible + + poll: Fix confusion between SOCKETs and FDs on native Windows. + Fix proposed by Daniel P. Berrange . + * lib/poll.c [WINDOWS_NATIVE]: Undefine select. + 2017-05-11 Bruno Haible doc: Clarify doc about socket functions on native Windows. diff --git a/lib/poll.c b/lib/poll.c index c4b2127bf9..818a2cdeeb 100644 --- a/lib/poll.c +++ b/lib/poll.c @@ -80,6 +80,10 @@ first argument, not any possible gnulib override. */ # undef recv +/* Here we need the select() function from Windows, because we pass bit masks + of SOCKETs, not bit masks of FDs. */ +# undef select + static BOOL IsConsoleHandle (HANDLE h) { DWORD mode; -- 2.39.5