[前][次][番号順一覧][スレッド一覧]

ruby-changes:31598

From: ngoto <ko1@a...>
Date: Thu, 14 Nov 2013 20:40:22 +0900 (JST)
Subject: [ruby-changes:31598] ngoto:r43677 (trunk): * ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris since r43460.

ngoto	2013-11-14 20:40:15 +0900 (Thu, 14 Nov 2013)

  New Revision: 43677

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43677

  Log:
    * ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris since r43460.

  Modified files:
    trunk/ChangeLog
    trunk/ruby_atomic.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43676)
+++ ChangeLog	(revision 43677)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Nov 14 20:24:15 2013  Naohisa Goto  <ngotogenome@g...>
+
+	* ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris
+	  since r43460.
+
 Thu Nov 14 19:53:00 2013  Tanaka Akira  <akr@f...>
 
 	* test/openssl/test_cipher.rb (test_aes_gcm_wrong_tag): Don't use
Index: ruby_atomic.h
===================================================================
--- ruby_atomic.h	(revision 43676)
+++ ruby_atomic.h	(revision 43677)
@@ -91,7 +91,7 @@ typedef unsigned int rb_atomic_t; https://github.com/ruby/ruby/blob/trunk/ruby_atomic.h#L91
 #  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))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]