diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-01-04 18:14:38 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-01-04 18:14:38 +0100 |
commit | 719690ed8dd90974508e5e545df22ca332122515 (patch) | |
tree | 6c28d6a2417d853fe59bf2d126bd9a73ff07e7a1 | |
parent | 9d7a226ada5d6bfc99514b95f8db643192b0b7a8 (diff) | |
parent | ba5dfaef3a8eceb111a363d9505b5f12bbbf451b (diff) |
Merge branch 't/select_deadcode' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
hurd/hurdselect.c
-rw-r--r-- | hurd/hurdselect.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c index 7bbf74f460..b5ebf35a40 100644 --- a/hurd/hurdselect.c +++ b/hurd/hurdselect.c @@ -464,13 +464,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; |