summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-25 04:34:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-25 04:34:00 +0000
commite81fc255006b815e79a914b05ec809a8bb84fe8b (patch)
tree01b2d6c3d9f2ed3ac42c1ece4871137c5dd04625
parentf88be143445890c8dece4e5f9c527e09ed8b9844 (diff)
downloadruby-e81fc255006b815e79a914b05ec809a8bb84fe8b.tar.gz
ruby-e81fc255006b815e79a914b05ec809a8bb84fe8b.tar.xz
ruby-e81fc255006b815e79a914b05ec809a8bb84fe8b.zip
* io.c (io_cntl): F_DUPFD is platform dependent.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d3ecfbc9e..7460338e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 25 13:33:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (io_cntl): F_DUPFD is platform dependent.
+
Sun Oct 25 10:19:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/handle.c (rb_dlhandle_close): fixed an invalid local
diff --git a/io.c b/io.c
index 426cba5a5..1488dc1ec 100644
--- a/io.c
+++ b/io.c
@@ -7237,9 +7237,11 @@ io_cntl(int fd, unsigned long cmd, long narg, int io_p)
# else
retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, (int)cmd, narg);
# endif
+# if defined(F_DUPFD)
if (!io_p && retval != -1 && cmd == F_DUPFD) {
UPDATE_MAXFD(retval);
}
+# endif
#else
if (!io_p) {
rb_notimplement();