usa	2012-10-12 13:31:48 +0900 (Fri, 12 Oct 2012)

  New Revision: 37150

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

  Log:
    * io.c (rb_cloexec_fcntl_dupfd): get rid of compile error on windows.
      reported by Donovan Lampa at [ruby-core:43152] [Backport #6127],
      based on a patch by Hiroshi Shirosaki at [ruby-core:47917].

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/io.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37149)
+++ ruby_1_9_3/ChangeLog	(revision 37150)
@@ -1,3 +1,9 @@
+Fri Oct 12 13:28:37 2012  NAKAMURA Usaku  <usa@r...>
+
+	* io.c (rb_cloexec_fcntl_dupfd): get rid of compile error on windows.
+	  reported by Donovan Lampa at [ruby-core:43152] [Backport #6127],
+	  based on a patch by Hiroshi Shirosaki at [ruby-core:47917].
+
 Fri Oct 12 00:30:17 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* io.c (ioctl_narg_len, linux_iocparm_len): reinstantiate linux
Index: ruby_1_9_3/io.c
===================================================================
--- ruby_1_9_3/io.c	(revision 37149)
+++ ruby_1_9_3/io.c	(revision 37150)
@@ -209,8 +209,11 @@
     else {
       ret = fcntl(fd, F_DUPFD, minfd);
     }
+#elif defined(F_DUPFD)
+    ret = fcntl(fd, F_DUPFD, minfd);
 #else
-    ret = fcntl(fd, F_DUPFD, minfd);
+    ret = -1;
+    errno = EINVAL;
 #endif
     if (ret == -1) return -1;
     rb_maygvl_fd_fix_cloexec(ret);
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37149)
+++ ruby_1_9_3/version.h	(revision 37150)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 279
+#define RUBY_PATCHLEVEL 280
 
 #define RUBY_RELEASE_DATE "2012-10-12"
 #define RUBY_RELEASE_YEAR 2012

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