mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

Fix FORCE_INLINE macro

Browse Source 
Accidentally put the code within a _MSC_VER #ifdef, causing the macro to
not be found on non-VC compilers
This commit is contained in:
jp9000 2014-02-09 08:06:34 -07:00
parent 20fd2c82dc
commit 29fb9cc9f4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libobs/util/c99defs.h
View File

@ -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