yugui	2009-01-16 00:38:31 +0900 (Fri, 16 Jan 2009)

  New Revision: 21557

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21557

  Log:
    merges r21504 from trunk into ruby_1_9_1.
    * io.c (rb_io_wait_readable, rb_io_wait_writable): need rb_fd_ptr.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/io.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21556)
+++ ruby_1_9_1/ChangeLog	(revision 21557)
@@ -1,5 +1,7 @@
-Wed Jan 14 12:38:02 2009  Nobuyoshi Nakada  <nobu@r...>
+Wed Jan 14 12:39:16 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* io.c (rb_io_wait_readable, rb_io_wait_writable): need rb_fd_ptr.
+
 	* io.c (appendline): reformed.
 
 	* io.c (rb_io_s_pipe): reduced nest of rb_ensure of main block.
Index: ruby_1_9_1/io.c
===================================================================
--- ruby_1_9_1/io.c	(revision 21556)
+++ ruby_1_9_1/io.c	(revision 21557)
@@ -630,7 +630,7 @@
 	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_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;
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/