merge revision(s) 57948,57949,57950:

	thread.c: rb_thread_fd_close [ci skip]

	* thread.c (rb_thread_fd_close): re-define only for abi-check,
	  abort if called.  [ruby-core:80078] [Bug #13304]
	thread.c: rb_thread_fd_close no longer returns
	thread.c: rb_thread_fd_close [ci skip]

	* thread.c (rb_thread_fd_close): remove deprecated. a couple of
	  external libraries used it.  [ruby-core:80078] [Bug #13304]

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

3 files changed, 17 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 593cdc3975..3e0ef09f87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Apr  9 22:21:23 2017  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	thread.c: rb_thread_fd_close [ci skip]
+
+	* thread.c (rb_thread_fd_close): re-define because of a couple of
+	  external libraries used it.
+
 Wed Mar 29 23:47:31 2017  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
 	* hash.c (any_hash): fix CI failure on L32LLP64 architecture.
diff --git a/thread.c b/thread.c
index 6e9099b9f5..e86ebee1f0 100644
--- a/thread.c
+++ b/thread.c
@@ -2187,6 +2187,12 @@ rb_notify_fd_close(int fd)
     return busy;
 }
 
+void
+rb_thread_fd_close(int fd)
+{
+    while (rb_notify_fd_close(fd));
+}
+
 /*
  *  call-seq:
  *     thr.raise
diff --git a/version.h b/version.h
index 17b906b43c..b2ad9d23d1 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.3.4"
-#define RUBY_RELEASE_DATE "2017-03-30"
-#define RUBY_PATCHLEVEL 301
+#define RUBY_RELEASE_DATE "2017-04-09"
+#define RUBY_PATCHLEVEL 302
 
 #define RUBY_RELEASE_YEAR 2017
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"