From 2d2544c8e66ce6cc0973611145d442a165a9c663 Mon Sep 17 00:00:00 2001 From: kosaki Date: Sat, 30 Apr 2011 11:15:15 +0000 Subject: * include/ruby/intern.h (rb_thread_select): mark as deprecated. * ext/io/wait/wait.c (wait_readable): use rb_thread_fd_select instead of rb_thread_select. * ext/socket/init.c (wait_connectable0): ditto. * ext/readline/readline.c (readline_event): ditto. * io.c (rb_io_wait_readable, wait_readable, rb_io_wait_writable, wait_writable): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index 34852adcdd..1278e7fa5b 100644 --- a/io.c +++ b/io.c @@ -691,7 +691,7 @@ wait_readable(VALUE p) { rb_fdset_t *rfds = (rb_fdset_t *)p; - return rb_thread_select(rb_fd_max(rfds), rb_fd_ptr(rfds), NULL, NULL, NULL); + return rb_thread_fd_select(rb_fd_max(rfds), rfds, NULL, NULL, NULL); } #endif @@ -721,7 +721,7 @@ rb_io_wait_readable(int f) rb_ensure(wait_readable, (VALUE)&rfds, (VALUE (*)(VALUE))rb_fd_term, (VALUE)&rfds); #else - rb_thread_select(f + 1, rb_fd_ptr(&rfds), NULL, NULL, NULL); + rb_thread_fd_select(f + 1, &rfds, NULL, NULL, NULL); #endif return TRUE; @@ -736,7 +736,7 @@ wait_writable(VALUE p) { rb_fdset_t *wfds = (rb_fdset_t *)p; - return rb_thread_select(rb_fd_max(wfds), NULL, rb_fd_ptr(wfds), NULL, NULL); + return rb_thread_fd_select(rb_fd_max(wfds), NULL, wfds, NULL, NULL); } #endif @@ -766,7 +766,7 @@ rb_io_wait_writable(int f) rb_ensure(wait_writable, (VALUE)&wfds, (VALUE (*)(VALUE))rb_fd_term, (VALUE)&wfds); #else - rb_thread_select(f + 1, NULL, rb_fd_ptr(&wfds), NULL, NULL); + rb_thread_fd_select(f + 1, NULL, &wfds, NULL, NULL); #endif return TRUE; -- cgit v1.2.3