summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-22 07:13:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-22 07:13:40 +0000
commit9e83ce20b1121068d9a708b41c623f4493c2eb53 (patch)
treecfed2fba136cccd8cf599de53a3b34f0972d909b /io.c
parenta3e8d63a758dd32c01159f2ca8a980223ada300e (diff)
* revert previous revision. it's already out-of-date.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/io.c b/io.c
index c62af6ee35..5555de7c26 100644
--- a/io.c
+++ b/io.c
@@ -5971,15 +5971,13 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
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;