usa	2017-04-09 22:26:01 +0900 (Sun, 09 Apr 2017)

  New Revision: 58289

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58289

  Log:
    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]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/thread.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 58288)
+++ ruby_2_3/ChangeLog	(revision 58289)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sun Apr  9 22:21:23 2017  NAKAMURA Usaku  <usa@r...>
+
+	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@r...>
 
 	* hash.c (any_hash): fix CI failure on L32LLP64 architecture.
Index: ruby_2_3/thread.c
===================================================================
--- ruby_2_3/thread.c	(revision 58288)
+++ ruby_2_3/thread.c	(revision 58289)
@@ -2187,6 +2187,12 @@ rb_notify_fd_close(int fd) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread.c#L2187
     return busy;
 }
 
+void
+rb_thread_fd_close(int fd)
+{
+    while (rb_notify_fd_close(fd));
+}
+
 /*
  *  call-seq:
  *     thr.raise
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 58288)
+++ ruby_2_3/version.h	(revision 58289)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #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"
 
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 58288)
+++ ruby_2_3	(revision 58289)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r57948-57950

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