[前][次][番号順一覧][スレッド一覧]

ruby-changes:18724

From: nobu <ko1@a...>
Date: Tue, 1 Feb 2011 07:56:15 +0900 (JST)
Subject: [ruby-changes:18724] Ruby:r30750 (trunk): * ext/io/console/console.c (console_winsize): use GetWriteFD.

nobu	2011-02-01 07:56:07 +0900 (Tue, 01 Feb 2011)

  New Revision: 30750

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

  Log:
    * ext/io/console/console.c (console_winsize): use GetWriteFD.

  Modified files:
    trunk/ChangeLog
    trunk/ext/io/console/console.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30749)
+++ ChangeLog	(revision 30750)
@@ -1,3 +1,7 @@
+Tue Feb  1 07:56:02 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/io/console/console.c (console_winsize): use GetWriteFD.
+
 Tue Feb  1 02:28:14 2011  Masaya Tarui  <tarui@r...>
 
 	* include/ruby/win32.h, win32/win32.c: add rb_w32_inet_ntop.
Index: ext/io/console/console.c
===================================================================
--- ext/io/console/console.c	(revision 30749)
+++ ext/io/console/console.c	(revision 30750)
@@ -387,17 +387,7 @@
     rb_console_size_t ws;
 
     GetOpenFile(io, fptr);
-#ifdef GetWriteFile
-    fd = fileno(GetWriteFile(fptr));
-#else
-# if defined HAVE_RB_IO_GET_WRITE_IO
-    io = fptr->tied_io_for_writing;
-    if (io) {
-	GetOpenFile(io, fptr);
-    }
-# endif
-    fd = fptr->fd;
-#endif
+    fd = GetWriteFD(fptr);
     if (!getwinsize(fd, &ws)) rb_sys_fail(0);
     return rb_assoc_new(INT2NUM(winsize_row(&ws)), INT2NUM(winsize_col(&ws)));
 }

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

[前][次][番号順一覧][スレッド一覧]