merge revision(s) 52892: [Backport #11775]

	* ruby_atomic.h (ATOMIC_SIZE_CAS): fix the argument order of
	  InterlockedCompareExchange64.  new value and then old value is
	  the last.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a65901a954..a783157bd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec  9 01:46:23 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby_atomic.h (ATOMIC_SIZE_CAS): fix the argument order of
+	  InterlockedCompareExchange64.  new value and then old value is
+	  the last.
+
 Wed Dec  9 01:28:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* encoding.c (enc_m_loader): defer finding encoding object not to
diff --git a/ruby_atomic.h b/ruby_atomic.h
index e2b1c87a2f..b25be1c3ae 100644
--- a/ruby_atomic.h
+++ b/ruby_atomic.h
@@ -81,7 +81,7 @@ rb_w32_atomic_cas(volatile rb_atomic_t *var, rb_atomic_t oldval, rb_atomic_t new
 #  define ATOMIC_SIZE_INC(var) InterlockedIncrement64(&(var))
 #  define ATOMIC_SIZE_DEC(var) InterlockedDecrement64(&(var))
 #  define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange64(&(var), (val))
-#  define ATOMIC_SIZE_CAS(var, oldval, val) InterlockedCompareExchange64(&(var), (oldval), (val))
+#  define ATOMIC_SIZE_CAS(var, oldval, newval) InterlockedCompareExchange64(&(var), (newval), (oldval))
 # else
 #  define ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd((LONG *)&(var), (val))
 #  define ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd((LONG *)&(var), -(LONG)(val))
diff --git a/version.h b/version.h
index 88c0d429d3..8ec7e0a955 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-12-09"
-#define RUBY_PATCHLEVEL 222
+#define RUBY_PATCHLEVEL 223
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12