summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2017-05-11 00:38:03 +0200
committerBruno Haible <bruno@clisp.org>2017-05-11 00:38:03 +0200
commit4df5fde5d4f69397f3435c9804da5c88ddc7721e (patch)
treeaa52b7066aa982e1c1b994bc4f6eaeca271caa4d
parent2511522d3b59597e8e43e88fdc894d6544c409fb (diff)
downloadgnulib-4df5fde5d4f69397f3435c9804da5c88ddc7721e.tar.gz
poll: Fix link error on native Windows.
* lib/poll.c [WINDOWS_NATIVE]: Undefine recv.
-rw-r--r--ChangeLog5
-rw-r--r--lib/poll.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index db28c2ee3f..e2b473b4e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2017-05-10 Bruno Haible <bruno@clisp.org>
+ poll: Fix link error on native Windows.
+ * lib/poll.c [WINDOWS_NATIVE]: Undefine recv.
+
+2017-05-10 Bruno Haible <bruno@clisp.org>
+
time: Fix missing initialization of HAVE_TIMEZONE_T.
* m4/time_h.m4 (gl_HEADER_TIME_H_DEFAULTS): Initialize HAVE_TIMEZONE_T
here...
diff --git a/lib/poll.c b/lib/poll.c
index 9115bcd4a9..c4b2127bf9 100644
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -76,6 +76,10 @@
#ifdef WINDOWS_NATIVE
+/* Here we need the recv() function from Windows, that takes a SOCKET as
+ first argument, not any possible gnulib override. */
+# undef recv
+
static BOOL IsConsoleHandle (HANDLE h)
{
DWORD mode;