ruby-changes:32957
From: usa <ko1@a...>
Date: Tue, 18 Feb 2014 22:54:42 +0900 (JST)
Subject: [ruby-changes:32957] usa:r45036 (ruby_1_9_3): * ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto at
usa 2014-02-18 22:54:32 +0900 (Tue, 18 Feb 2014) New Revision: 45036 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45036 Log: * ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto at [ruby-dev:47980] [Backport #9530] Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/ruby_atomic.h branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 45035) +++ ruby_1_9_3/ChangeLog (revision 45036) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1 +Tue Feb 18 22:53:34 2014 NAKAMURA Usaku <usa@r...> + + * ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto at + [ruby-dev:47980] [Backport #9530] + Mon Feb 17 18:04:40 2014 Aaron Pfeifer <aaron.pfeifer@g...> * thread.c (terminate_atfork_i): fix locking mutexes not unlocked in Index: ruby_1_9_3/ruby_atomic.h =================================================================== --- ruby_1_9_3/ruby_atomic.h (revision 45035) +++ ruby_1_9_3/ruby_atomic.h (revision 45036) @@ -119,7 +119,8 @@ typedef unsigned int rb_atomic_t; https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ruby_atomic.h#L119 # define ATOMIC_SIZE_INC(var) atomic_inc_ulong(&(var)) # define ATOMIC_SIZE_DEC(var) atomic_dec_ulong(&(var)) # define ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_ulong(&(var), (val)) -# define ATOMIC_SIZE_CAS(var, oldval, val) atomic_cas_ulong(&(var), (oldval), (# else +# define ATOMIC_SIZE_CAS(var, oldval, val) atomic_cas_ulong(&(var), (oldval), (val)) +# else # define ATOMIC_SIZE_ADD(var, val) atomic_add_int(&(var), (val)) # define ATOMIC_SIZE_SUB(var, val) atomic_add_int(&(var), -(val)) # define ATOMIC_SIZE_INC(var) atomic_inc_uint(&(var)) Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 45035) +++ ruby_1_9_3/version.h (revision 45036) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1 #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 535 +#define RUBY_PATCHLEVEL 536 -#define RUBY_RELEASE_DATE "2014-02-17" +#define RUBY_RELEASE_DATE "2014-02-18" #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 18 #include "ruby/version.h" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/