[Pkg-gnupg-commit] [libgpg-error] 20/35: estream, w32: Temporary fix for gpgrt_poll.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Apr 25 21:47:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository libgpg-error.
commit 4354720ab3631dfd2811d881566b10a72c8f2165
Author: Werner Koch <wk at gnupg.org>
Date: Tue Apr 5 15:43:26 2016 +0200
estream,w32: Temporary fix for gpgrt_poll.
* src/estream.c (_gpgrt_poll) [W32]: Do not use FD_ISSET.
--
gpgrt_poll return an error on Windows anyway and thus it does not make
sense to use a possible undefined macro here.
Reported-by: Andre Heinecke
Signed-off-by: Werner Koch <wk at gnupg.org>
---
src/estream.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/estream.c b/src/estream.c
index a593acd..499cc75 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -4832,6 +4832,9 @@ _gpgrt_poll (gpgrt_poll_t *fds, unsigned int nfds, int timeout)
item->got_hup = 1;
any = 1;
}
+#ifndef _WIN32
+ /* NB.: We can't use FD_ISSET under windows - but we don't have
+ * support for it anyway. */
if (item->want_read && FD_ISSET (fd, &readfds))
{
item->got_read = 1;
@@ -4847,6 +4850,7 @@ _gpgrt_poll (gpgrt_poll_t *fds, unsigned int nfds, int timeout)
item->got_oob = 1;
any = 1;
}
+#endif /*!_WIN32*/
if (any)
count++;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libgpg-error.git
More information about the Pkg-gnupg-commit
mailing list