summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-30 20:28:50 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-30 20:28:50 +0000
commite733edd76bf4ca19858187195134908b53e60aab (patch)
treef1b8254c5fe024389ed1a507baea0dd97fe00e75 /thread.c
parentc45ad62966891edb6180f7b0ed068f12c96642f0 (diff)
merge revision(s) 33132:
* thread.c (rb_thread_select): critical typo in r33117. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/thread.c b/thread.c
index 9e70a1e386..28eece555d 100644
--- a/thread.c
+++ b/thread.c
@@ -2704,7 +2704,7 @@ rb_thread_select(int max, fd_set * read, fd_set * write, fd_set * except,
rb_fd_copy(efds, except, max);
}
- retval = rb_thread_fd_select(max, rfds, efds, wfds, timeout);
+ retval = rb_thread_fd_select(max, rfds, wfds, efds, timeout);
if (rfds)
rb_fd_term(rfds);