From 9c136e1168a1f6d0637f59164b6d9adb9ba0bdee Mon Sep 17 00:00:00 2001 From: James Churchill Date: Fri, 11 Jan 2019 18:30:20 +1000 Subject: Improved fix for __always_inline redefinition bug Instead of changing based on the version of GCC, check for the presence of the macro instead. --- tmk_core/protocol/arm_atsam/usb/compiler.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/arm_atsam/usb/compiler.h b/tmk_core/protocol/arm_atsam/usb/compiler.h index 7d8350896..b2ccfd73e 100644 --- a/tmk_core/protocol/arm_atsam/usb/compiler.h +++ b/tmk_core/protocol/arm_atsam/usb/compiler.h @@ -134,13 +134,15 @@ * heuristics and inline the function no matter how big it thinks it * becomes. */ +#if !defined(__always_inline) #if defined(__CC_ARM) # define __always_inline __forceinline -#elif (defined __GNUC__ && __GNUC__ <= 6) +#elif (defined __GNUC__) # define __always_inline __attribute__((__always_inline__)) #elif (defined __ICCARM__) # define __always_inline _Pragma("inline=forced") #endif +#endif /** * \def __no_inline -- cgit v1.2.3-70-g09d2