merges r21504 from trunk into ruby_1_9_1.

* io.c (rb_io_wait_readable, rb_io_wait_writable): need rb_fd_ptr.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f9b6d4393..bfe29fbf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Wed Jan 14 12:38:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 14 12:39:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_wait_readable, rb_io_wait_writable): need rb_fd_ptr.
 
 	* io.c (appendline): reformed.
 
diff --git a/io.c b/io.c
index 247e94fa0..553a55b2c 100644
--- a/io.c
+++ b/io.c
@@ -630,7 +630,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, &rfds, NULL, NULL, NULL);
+	rb_thread_select(f + 1, rb_fd_ptr(&rfds), NULL, NULL, NULL);
 #endif
 	return Qtrue;
 
@@ -675,7 +675,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, &wfds, NULL, NULL);
+	rb_thread_select(f + 1, NULL, rb_fd_ptr(&wfds), NULL, NULL);
 #endif
 	return Qtrue;