From 44ff9fda8302cfab5bf95bef9e9b4059d33f8f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Wed, 16 Sep 2015 22:31:59 -0700
Subject: [PATCH] Cleanup.

---
 include/bx/cpu.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/bx/cpu.h b/include/bx/cpu.h
index 17e7557..cdaa8f7 100644
--- a/include/bx/cpu.h
+++ b/include/bx/cpu.h
@@ -79,7 +79,7 @@ namespace bx
 	inline int32_t atomicFetchAndAdd(volatile int32_t* _ptr, int32_t _add)
 	{
 #if BX_COMPILER_MSVC
-		return _InterlockedExchangeAdd(_ptr, _add);
+		return _InterlockedExchangeAdd( (volatile long*)_ptr, _add);
 #else
 		return __sync_fetch_and_add(_ptr, _add);
 #endif // BX_COMPILER_
@@ -88,7 +88,7 @@ namespace bx
 	inline int32_t atomicAddAndFetch(volatile int32_t* _ptr, int32_t _add)
 	{
 #if BX_COMPILER_MSVC
-		return _InterlockedExchangeAdd(_ptr, _add) + _add;
+		return atomicFetchAndAdd(_ptr, _add) + _add;
 #else
 		return __sync_add_and_fetch(_ptr, _add);
 #endif // BX_COMPILER_
@@ -97,7 +97,7 @@ namespace bx
 	inline int32_t atomicFetchAndSub(volatile int32_t* _ptr, int32_t _sub)
 	{
 #if BX_COMPILER_MSVC
-		return _InterlockedExchangeAdd(_ptr, -_sub);
+		return atomicFetchAndAdd(_ptr, -_sub);
 #else
 		return __sync_fetch_and_sub(_ptr, _sub);
 #endif // BX_COMPILER_
@@ -106,7 +106,7 @@ namespace bx
 	inline int32_t atomicSubAndFetch(volatile int32_t* _ptr, int32_t _sub)
 	{
 #if BX_COMPILER_MSVC
-		return _InterlockedExchangeAdd(_ptr, -_sub) - _sub;
+		return atomicFetchAndAdd(_ptr, -_sub) - _sub;
 #else
 		return __sync_sub_and_fetch(_ptr, _sub);
 #endif // BX_COMPILER_