From 5dc6d20cc3535f21cf267923f66b98fac1d93309 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 3 Feb 2012 01:11:37 +0000 Subject: merge revision(s) r34038,34099: * thread_pthread.c (ubf_select): call rb_thread_wakeup_timer_thread() only when it is not timer_thread. [Bug #5757] [ruby-dev:44985] patched by Tomoyuki Chikanaga. * thread_pthread.c (ping_signal_thread_list): remove return value. * thread_pthread.c (check_signal_thread_list): add a new function to check if signal thread list is empty. * thread_pthread.c (thread_timer): check signal thread list after timer_thread_function(). main thread might be added into signal thread list during timer_thread_function(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'version.h') diff --git a/version.h b/version.h index f360c37085..ae945241e4 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 29 +#define RUBY_PATCHLEVEL 30 -#define RUBY_RELEASE_DATE "2012-02-01" +#define RUBY_RELEASE_DATE "2012-02-03" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" -- cgit v1.2.3