naruse	2011-11-01 14:56:51 +0900 (Tue, 01 Nov 2011)

  New Revision: 33602

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

  Log:
    * io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument is int.
    
    * process.c (move_fds_to_avoid_crash): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/io.c
    trunk/process.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33601)
+++ ChangeLog	(revision 33602)
@@ -1,3 +1,9 @@
+Tue Nov  1 14:55:29 2011  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* vsnprintf.c (BSD_vfprintf): support 'll' prefix.
Index: io.c
===================================================================
--- io.c	(revision 33601)
+++ io.c	(revision 33602)
@@ -7842,7 +7842,7 @@
     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);
Index: process.c
===================================================================
--- process.c	(revision 33601)
+++ process.c	(revision 33602)
@@ -2499,7 +2499,7 @@
 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;

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