usa	2009-01-22 16:13:40 +0900 (Thu, 22 Jan 2009)

  New Revision: 21735

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

  Log:
    * revert previous revision.  it's already out-of-date.

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/win32.h
    trunk/io.c
    trunk/win32/win32.c

Index: include/ruby/win32.h
===================================================================
--- include/ruby/win32.h	(revision 21734)
+++ include/ruby/win32.h	(revision 21735)
@@ -214,7 +214,6 @@
 extern void   rb_w32_fdset(int, fd_set*);
 extern void   rb_w32_fdclr(int, fd_set*);
 extern int    rb_w32_fdisset(int, fd_set*);
-extern int    rb_w32_is_valid_fd(int);
 extern int    WSAAPI rb_w32_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
 extern int    WSAAPI rb_w32_getpeername(int, struct sockaddr *, int *);
 extern int    WSAAPI rb_w32_getsockname(int, struct sockaddr *, int *);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21734)
+++ ChangeLog	(revision 21735)
@@ -1,3 +1,7 @@
+Thu Jan 22 16:12:51 2009  NAKAMURA Usaku  <usa@r...>
+
+	* revert previous revision.  it's already out-of-date.
+
 Thu Jan 22 15:54:02 2009  NAKAMURA Usaku  <usa@r...>
 
 	* include/ruby/win32.h, win32/win32.c (rb_w32_is_valid_fd): new function
Index: io.c
===================================================================
--- io.c	(revision 21734)
+++ io.c	(revision 21735)
@@ -5971,15 +5971,13 @@
     fd = NUM2INT(fnum);
     if (fstat(fd, &st) == -1) rb_sys_fail(0);
     UPDATE_MAXFD(fd);
-#if defined(HAVE_FCNTL) && defined(F_GETFL)
     if (NIL_P(vmode)) {
+#if defined(HAVE_FCNTL) && defined(F_GETFL)
         oflags = fcntl(fd, F_GETFL);
         if (oflags == -1) rb_sys_fail(0);
         fmode = rb_io_oflags_fmode(oflags);
-    }
-#elif defined(_WIN32)
-    if (rb_w32_is_valid_fd(fd)) rb_sys_fail(0);
 #endif
+    }
     MakeOpenFile(io, fp);
     fp->fd = fd;
     fp->mode = fmode;
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 21734)
+++ win32/win32.c	(revision 21735)
@@ -1836,15 +1836,6 @@
 }
 #endif
 
-int
-rb_w32_is_valid_fd(int fd)
-{
-    if (_get_osfhandle(fd) == -1)
-	return -1;
-    else
-	return 0;
-}
-
 #undef getsockopt
 
 static int

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