* 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].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a449a4148..d08b82b7f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 12 13:28:37 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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@gmail.com>
 
 	* io.c (ioctl_narg_len, linux_iocparm_len): reinstantiate linux
diff --git a/io.c b/io.c
index 5821b4a434..d6dc635149 100644
--- a/io.c
+++ b/io.c
@@ -209,8 +209,11 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
     else {
       ret = fcntl(fd, F_DUPFD, minfd);
     }
-#else
+#elif defined(F_DUPFD)
     ret = fcntl(fd, F_DUPFD, minfd);
+#else
+    ret = -1;
+    errno = EINVAL;
 #endif
     if (ret == -1) return -1;
     rb_maygvl_fd_fix_cloexec(ret);
diff --git a/version.h b/version.h
index 81b689bad4..492e9dd28e 100644
--- a/version.h
+++ b/version.h
@@ -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