diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-18 13:54:32 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-18 13:54:32 +0000 |
commit | 85186dab0add187a7f02aec0abead7fd4e1c6e71 (patch) | |
tree | 3d21a1a6f607d1a49cc46dd706c6a2b3efd8f8ee | |
parent | efe5d8db6e7934e7a6e4cec3f8b134b622a63b0c (diff) |
* ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto at
[ruby-dev:47980] [Backport #9530]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ruby_atomic.h | 3 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Feb 18 22:53:34 2014 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@gmail.com> * thread.c (terminate_atfork_i): fix locking mutexes not unlocked in diff --git a/ruby_atomic.h b/ruby_atomic.h index fea43d1f8b..df1c10da8c 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -119,7 +119,8 @@ typedef unsigned int rb_atomic_t; # 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)) @@ -1,10 +1,10 @@ #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" |