aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--hurd/hurdselect.c7
2 files changed, 2 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 97849df706..4ba04cdd86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@
45.
* hurd/hurdselect.c (_hurd_select): Pass MACH_RCV_INTERRUPT to
__mach_msg. If that returns MACH_RCV_INTERRUPTED, set ERR to EINTR.
+ * hurd/hurdselect.c (_hurd_select): Remove unreachable check for
+ MACH_RCV_TIMED_OUT.
2015-02-06 Roland McGrath <roland@hack.frob.com>
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c
index bd31c94aae..1d908548e2 100644
--- a/hurd/hurdselect.c
+++ b/hurd/hurdselect.c
@@ -407,13 +407,6 @@ _hurd_select (int nfds,
}
}
- if (err == MACH_RCV_TIMED_OUT)
- /* This is the normal value for ERR. We might have timed out and
- read no messages. Otherwise, after receiving the first message,
- we poll for more messages. We receive with a timeout of 0 to
- effect a poll, so ERR is MACH_RCV_TIMED_OUT when the poll finds no
- message waiting. */
- err = 0;
if (msgerr == MACH_RCV_INTERRUPTED)
/* Interruption on our side (e.g. signal reception). */
err = EINTR;