From 29fb9cc9f43a7f10541eb5f7f8276239bfb6f84d Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 9 Feb 2014 08:06:34 -0700 Subject: [PATCH] Fix FORCE_INLINE macro Accidentally put the code within a _MSC_VER #ifdef, causing the macro to not be found on non-VC compilers --- libobs/util/c99defs.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libobs/util/c99defs.h b/libobs/util/c99defs.h index e1ecb004d..f711dd3fa 100644 --- a/libobs/util/c99defs.h +++ b/libobs/util/c99defs.h @@ -21,6 +21,12 @@ * bool, inline, stdint */ +#ifdef _MSC_VER +#define FORCE_INLINE __forceinline +#else +#define FORCE_INLINE __attribute__(always_inline) +#endif + #ifdef _MSC_VER #pragma warning (disable : 4996) @@ -36,12 +42,6 @@ #define inline __inline #endif -#ifdef _MSC_VER -#define FORCE_INLINE __forceinline -#else -#define FORCE_INLINE __attribute__(always_inline) -#endif - #define EXPORT __declspec(dllexport) #else #define EXPORT