From c3c06ff78c956f6546f1769259328b77c062c444 Mon Sep 17 00:00:00 2001 From: ngoto Date: Thu, 14 Nov 2013 11:40:15 +0000 Subject: * ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris since r43460. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ruby_atomic.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c6beb5aac7..5dc077a838 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 14 20:24:15 2013 Naohisa Goto + + * ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris + since r43460. + Thu Nov 14 19:53:00 2013 Tanaka Akira * test/openssl/test_cipher.rb (test_aes_gcm_wrong_tag): Don't use diff --git a/ruby_atomic.h b/ruby_atomic.h index 9a9a148d7e..7e16d287f8 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -91,7 +91,7 @@ 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), (val)) +# 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)) -- cgit v1.2.3