diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/sync.rb | 5 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Fri Feb 20 01:41:08 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/sync.rb (Sync_m#sync_try_lock): wrong variable name fixed. + a patch from [ruby-core:20561] + + * lib/sync.rb (Sync_m::Err.Fail): turn off Thread.critical before + exit. + Thu Feb 19 18:02:10 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. diff --git a/lib/sync.rb b/lib/sync.rb index 79522ed885..9e522c2466 100644 --- a/lib/sync.rb +++ b/lib/sync.rb @@ -54,6 +54,7 @@ module Sync_m # exceptions class Err < StandardError def Err.Fail(*opt) + Thread.critical = false fail self, sprintf(self::Message, *opt) end @@ -129,10 +130,10 @@ module Sync_m # locking methods. def sync_try_lock(mode = EX) - return unlock if sync_mode == UN + return unlock if mode == UN Thread.critical = true - ret = sync_try_lock_sub(sync_mode) + ret = sync_try_lock_sub(mode) Thread.critical = false ret end @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-02-19" +#define RUBY_RELEASE_DATE "2009-02-20" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090219 -#define RUBY_PATCHLEVEL 130 +#define RUBY_RELEASE_CODE 20090220 +#define RUBY_PATCHLEVEL 131 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |