~ruther/qmk_firmware

9c136e1168a1f6d0637f59164b6d9adb9ba0bdee — James Churchill 6 years ago 2c41093
Improved fix for __always_inline redefinition bug

Instead of changing based on the version of GCC, check for the presence of the macro instead.
1 files changed, 3 insertions(+), 1 deletions(-)

M tmk_core/protocol/arm_atsam/usb/compiler.h
M tmk_core/protocol/arm_atsam/usb/compiler.h => tmk_core/protocol/arm_atsam/usb/compiler.h +3 -1
@@ 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