summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-19 07:48:23 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-19 07:48:23 +0000
commitd9b62d9e0fa0fd4f678e8f3c159cca17c62f6043 (patch)
tree1409b9a5e599a8fb535427e324da46c388d9fe49 /eval.c
parent30be8116cde745d811a32160e903831554e72d78 (diff)
* eval.c : fix typo. erestart -> errno. rb_thread_wait_for().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/eval.c b/eval.c
index dce22a3cf1..587b329b95 100644
--- a/eval.c
+++ b/eval.c
@@ -7574,7 +7574,7 @@ rb_thread_schedule()
if (rb_trap_pending) rb_trap_exec();
if (errno == EINTR) goto again;
#ifdef ERESTART
- if (erestart == ERESTART) goto again;
+ if (errno == ERESTART) goto again;
#endif
FOREACH_THREAD_FROM(curr, th) {
if (th->wait_for & WAIT_SELECT) {
@@ -7807,21 +7807,20 @@ rb_thread_select(max, read, write, except, timeout)
TRAP_BEG;
n = select(max, read, write, except, tvp);
TRAP_END;
- switch (errno) {
- case EINTR:
+ switch (errno) {
+ case EINTR:
#ifdef ERESTART
- case ERESTART:
+ case ERESTART:
#endif
- if (timeout) {
- double d = timeofday() - limit;
+ if (timeout) {
+ double d = timeofday() - limit;
- tv.tv_sec = (unsigned int)d;
- tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
- }
- continue;
- default:
- break;
+ tv.tv_sec = (unsigned int)d;
+ tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
}
+ continue;
+ default:
+ break;
}
return n;
}