From f9269809027806f3b41ad73207721bd8adb35650 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 1 Nov 2011 05:56:51 +0000
Subject: [PATCH] * io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument
 is int.

* process.c (move_fds_to_avoid_crash): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 io.c      | 2 +-
 process.c | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ade39ea923..c80b1f5c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov  1 14:55:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument is int.
+
+	* process.c (move_fds_to_avoid_crash): ditto.
+
 Tue Nov  1 13:14:33 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* vsnprintf.c (BSD_vfprintf): support 'll' prefix.
diff --git a/io.c b/io.c
index 7ea40b320a..50ee6871ca 100644
--- a/io.c
+++ b/io.c
@@ -7842,7 +7842,7 @@ static VALUE nogvl_io_cntl(void *ptr)
     else
 #if defined(F_DUPFD)
         if (arg->cmd == F_DUPFD)
-            return (VALUE)rb_cloexec_fcntl_dupfd(arg->fd, arg->narg);
+            return (VALUE)rb_cloexec_fcntl_dupfd(arg->fd, (int)arg->narg);
         else
 #endif
             return (VALUE)fcntl(arg->fd, arg->cmd, arg->narg);
diff --git a/process.c b/process.c
index b0f7ae85a2..069fcc7efe 100644
--- a/process.c
+++ b/process.c
@@ -2499,7 +2499,7 @@ proc_syswait(VALUE pid)
 static int
 move_fds_to_avoid_crash(int *fdp, int n, VALUE fds)
 {
-    long min = 0;
+    int min = 0;
     int i;
     for (i = 0; i < n; i++) {
         int ret;