Merge pull request #1552 from danilaml/fixes

Fixes for #1550 and #1546
This commit is contained in:
vlj
2016-03-07 20:10:59 +01:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -23,7 +23,7 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define force_inline __forceinline #define force_inline __forceinline
#else #else
#define force_inline __attribute__((always_inline)) #define force_inline __attribute__((always_inline)) inline
#endif #endif
#if defined(_MSC_VER) && _MSC_VER <= 1800 #if defined(_MSC_VER) && _MSC_VER <= 1800