diff options
Diffstat (limited to 'intern/guardedalloc/intern/mallocn_intern.h')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_intern.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index 523d1786b97..7da74f7cc4c 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -103,6 +103,13 @@ # include <stdlib.h> #endif +/* visual studio 2012 does not define inline for C */ +#ifdef _MSC_VER +# define MEM_INLINE static __inline +#else +# define MEM_INLINE static inline +#endif + #define IS_POW2(a) (((a) & ((a) - 1)) == 0) /* Extra padding which needs to be applied on MemHead to make it aligned. */ |