From b4a029c234bc2166ee8b4e15392628fdf4f505ec Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Thu, 16 Jan 2020 20:43:38 +0100 Subject: [PATCH] Fix ID_MAYBE_INLINE on non-Windows platforms --- neo/sys/platform.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neo/sys/platform.h b/neo/sys/platform.h index 2c5f71c4..4e78868c 100644 --- a/neo/sys/platform.h +++ b/neo/sys/platform.h @@ -99,7 +99,6 @@ If you have questions concerning this license or the applicable additional terms #define ALIGN16( x ) x __attribute__ ((aligned (16))) #define PACKED __attribute__((packed)) #define ID_INLINE inline -#define ID_MAYBE_INLINE inline #define ID_STATIC_TEMPLATE #define assertmem( x, y ) #endif @@ -165,6 +164,10 @@ If you have questions concerning this license or the applicable additional terms #endif +#ifndef ID_MAYBE_INLINE +// for MSVC it's __inline, otherwise just inline should work +#define ID_MAYBE_INLINE inline +#endif // ID_MAYBE_INLINE #ifdef __GNUC__ #define id_attribute(x) __attribute__(x)