summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-26 08:25:14 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-26 08:25:14 +0000
commitce3ea463ba7c11d3825db3131a292abca543bb4e (patch)
tree89c2bbbb7ab205f7672406f8ba3399bcc4a59441
parent1fb37c4c1af40584a9238615808af3cb22e11428 (diff)
downloadruby-ce3ea463ba7c11d3825db3131a292abca543bb4e.tar.gz
* thread.c (rb_thread_fd_close): unintentionally removed at r58094.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--thread.c6
-rw-r--r--version.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 54a1c60dea..3c5af4ba75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 26 17:24:02 2017 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread.c (rb_thread_fd_close): unintentionally removed at r58094.
+
Sun Mar 26 16:24:02 2017 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_thread.rb (test_thread_interrupt_for_killed_thread):
diff --git a/thread.c b/thread.c
index d769402105..348ab8026e 100644
--- a/thread.c
+++ b/thread.c
@@ -2159,6 +2159,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 5c2243f993..1b0cfd8f1f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26"
-#define RUBY_PATCHLEVEL 467
+#define RUBY_PATCHLEVEL 468
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3