Merge commit '6a93b596c5c3af31b843d63013a7985ffeea354d'

jamrial · jamrial · commit eab5d29810d5 · 2017-04-13T18:27:20.000-03:00
* commit '6a93b596c5c3af31b843d63013a7985ffeea354d':
  compat/atomics: add typecasts in atomic_compare_exchange_strong()

Merged-by: James Almer &lt;jamrial@gmail.com&gt;
diff --git a/compat/atomics/suncc/stdatomic.h b/compat/atomics/suncc/stdatomic.h
@@ -108,7 +108,7 @@ static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *exp
                                                  intptr_t desired)
 {
     intptr_t  old = *expected;
-    *expected = atomic_cas_ptr(object, old, desired);
+    *expected = (intptr_t)atomic_cas_ptr(object, (void *)old, (void *)desired);
     return *expected == old;
 }
 
diff --git a/compat/atomics/win32/stdatomic.h b/compat/atomics/win32/stdatomic.h
@@ -105,7 +105,8 @@ static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *exp
                                                  intptr_t desired)
 {
     intptr_t old = *expected;
-    *expected = InterlockedCompareExchangePointer(object, desired, old);
+    *expected = (intptr_t)InterlockedCompareExchangePointer(
+        (PVOID *)object, (PVOID)desired, (PVOID)old);
     return *expected == old;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ static inline int atomic_compare_exchange_strong(intptr_t object, intptr_t exp`
`108`	`108`	`intptr_t desired)`
`109`	`109`	`{`
`110`	`110`	`intptr_t old = *expected;`
`111`		`- *expected = atomic_cas_ptr(object, old, desired);`
	`111`	`+ expected = (intptr_t)atomic_cas_ptr(object, (void )old, (void *)desired);`
`112`	`112`	`return *expected == old;`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ static inline int atomic_compare_exchange_strong(intptr_t object, intptr_t exp`
`105`	`105`	`intptr_t desired)`
`106`	`106`	`{`
`107`	`107`	`intptr_t old = *expected;`
`108`		`- *expected = InterlockedCompareExchangePointer(object, desired, old);`
	`108`	`+ *expected = (intptr_t)InterlockedCompareExchangePointer(`
	`109`	`+ (PVOID *)object, (PVOID)desired, (PVOID)old);`
`109`	`110`	`return *expected == old;`
`110`	`111`	`}`
`111`	`112`