From df06f1c816efbe5f6f221110edd024489120bbfc Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 23 Nov 2017 16:53:03 +0100 Subject: Attempt to fix bloody MSVC atomic intrinsic mess... --- intern/atomic/intern/atomic_ops_msvc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern') diff --git a/intern/atomic/intern/atomic_ops_msvc.h b/intern/atomic/intern/atomic_ops_msvc.h index ab31b3b789a..5e83675f815 100644 --- a/intern/atomic/intern/atomic_ops_msvc.h +++ b/intern/atomic/intern/atomic_ops_msvc.h @@ -142,7 +142,7 @@ ATOMIC_INLINE int32_t atomic_sub_and_fetch_int32(int32_t *p, int32_t x) ATOMIC_INLINE int32_t atomic_cas_int32(int32_t *v, int32_t old, int32_t _new) { - return InterlockedCompareExchange(v, _new, old); + return InterlockedCompareExchange((long *)v, _new, old); } ATOMIC_INLINE int32_t atomic_fetch_and_add_int32(int32_t *p, int32_t x) @@ -152,12 +152,12 @@ ATOMIC_INLINE int32_t atomic_fetch_and_add_int32(int32_t *p, int32_t x) ATOMIC_INLINE int32_t atomic_fetch_and_or_int32(int32_t *p, int32_t x) { - return InterlockedOr(p, x); + return InterlockedOr((long *)p, x); } ATOMIC_INLINE int32_t atomic_fetch_and_and_int32(int32_t *p, int32_t x) { - return InterlockedAnd(p, x); + return InterlockedAnd((long *)p, x); } /******************************************************************************/ -- cgit v1.2.3