summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/eval.c b/eval.c
index 628e16c9697..9e666d7e476 100644
--- a/eval.c
+++ b/eval.c
@@ -8058,6 +8058,9 @@ rb_thread_select(max, read, write, except, timeout)
tv = *timeout;
tvp = &tv;
}
+#else
+ struct timeval *const tvp = timeout;
+#endif
for (;;) {
TRAP_BEG;
n = select(max, read, write, except, tvp);
@@ -8068,6 +8071,7 @@ rb_thread_select(max, read, write, except, timeout)
#ifdef ERESTART
case ERESTART:
#endif
+#ifndef linux
if (timeout) {
double d = limit - timeofday();
@@ -8076,6 +8080,7 @@ rb_thread_select(max, read, write, except, timeout)
if (tv.tv_sec < 0) tv.tv_sec = 0;
if (tv.tv_usec < 0) tv.tv_usec = 0;
}
+#endif
continue;
default:
break;
@@ -8083,24 +8088,6 @@ rb_thread_select(max, read, write, except, timeout)
}
return n;
}
-#else
- for (;;) {
- TRAP_BEG;
- n = select(max, read, write, except, timeout);
- TRAP_END;
- if (n < 0) {
- switch (errno) {
- case EINTR:
-#ifdef ERESTART
- case ERESTART:
-#endif
- continue;
- }
- }
- return n;
- }
-#endif
-
}
curr_thread->status = THREAD_STOPPED;