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 /ruby_atomic.h | |
| 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
Diffstat (limited to 'ruby_atomic.h')
| -rw-r--r-- | ruby_atomic.h | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |