From 005d2bc1176b71addcb793733d1d6e577a1051df Mon Sep 17 00:00:00 2001
From: Irlan <Irlan@DESKTOP-Q1RSAUM>
Date: Fri, 7 Apr 2017 11:06:10 -0300
Subject: [PATCH] fix last merge

---
 include/bounce/common/settings.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/bounce/common/settings.h b/include/bounce/common/settings.h
index b2c4775..f0b4c02 100644
--- a/include/bounce/common/settings.h
+++ b/include/bounce/common/settings.h
@@ -116,12 +116,12 @@ typedef float float32;
 #define B3_MiB(n) (1024 * B3_KiB(n))
 #define B3_GiB(n) (1024 * B3_MiB(n))
 
-#ifndef _MSC_VER
-  #ifdef __cplusplus
-  #define B3_FORCE_INLINE inline
-  #else
-  #define B3_FORCE_INLINE
-  #endif
+#ifndef B3_FORCE_INLINE
+# if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#  define B3_FORCE_INLINE __forceinline
+# else
+#  define B3_FORCE_INLINE __inline
+# endif
 #endif
 
 #define B3_PROFILE(name) b3ProfileScope scope(name)