* io.c (wsplit_p): patch for the environment where

  fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
  set FMODE_WSPLIT without fcntl check. [ruby-dev:26566]


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

2 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e1e9a6076..4b5fc2c5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 20 18:33:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* io.c (wsplit_p): patch for the environment where
+	  fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
+	  set FMODE_WSPLIT without fcntl check. [ruby-dev:26566]
+
 Wed Jul 20 18:07:11 2005  Tanaka Akira  <akr@m17n.org>
 
 	* io.c (rb_io_ctl): update FMODE_WSPLIT_INITIALIZED and FMODE_WSPLIT
diff --git a/io.c b/io.c
index 10bbe574c..253690b42 100644
--- a/io.c
+++ b/io.c
@@ -380,9 +380,12 @@ wsplit_p(OpenFile *fptr)
         struct stat buf;
         if (fstat(fptr->fd, &buf) == 0 &&
             !(S_ISREG(buf.st_mode) ||
-              S_ISDIR(buf.st_mode)) &&
-            (r = fcntl(fptr->fd, F_GETFL)) != -1 &&
-            !(r & O_NONBLOCK)) {
+              S_ISDIR(buf.st_mode))
+#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
+            && (r = fcntl(fileno(f), F_GETFL)) != -1 &&
+            !(r & O_NONBLOCK)
+#endif
+            ) {
             fptr->mode |= FMODE_WSPLIT;
         }
         fptr->mode |= FMODE_WSPLIT_INITIALIZED;