This is the same fix applied for the conditional code that uses select() that was already done for the poll specific code in commit b61e8b81.