usa	2015-12-08 11:54:17 +0900 (Tue, 08 Dec 2015)

  New Revision: 52934

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

  Log:
    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.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ruby_atomic.h
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 52933)
+++ ruby_2_1/ChangeLog	(revision 52934)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Dec  8 11:53:06 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby_atomic.h (ATOMIC_SIZE_CAS): fix the argument order of
+	  InterlockedCompareExchange64.  new value and then old value is
+	  the last.
+
 Tue Dec  8 11:45:42 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (enc_m_loader): defer finding encoding object not to
Index: ruby_2_1/ruby_atomic.h
===================================================================
--- ruby_2_1/ruby_atomic.h	(revision 52933)
+++ ruby_2_1/ruby_atomic.h	(revision 52934)
@@ -81,7 +81,7 @@ rb_w32_atomic_cas(volatile rb_atomic_t * https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ruby_atomic.h#L81
 #  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))
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 52933)
+++ ruby_2_1/version.h	(revision 52934)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.8"
 #define RUBY_RELEASE_DATE "2015-12-08"
-#define RUBY_PATCHLEVEL 433
+#define RUBY_PATCHLEVEL 434
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r52892


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