qmk

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.z3bra.org/qmk.git
Log | Files | Refs | Submodules | LICENSE

commit 9c136e1168a1f6d0637f59164b6d9adb9ba0bdee
parent 2c4109394fa9ee71b10b8b2d3d1473a409d7003e
Author: James Churchill <pelrun@gmail.com>
Date:   Fri, 11 Jan 2019 18:30:20 +1000

Improved fix for __always_inline redefinition bug

Instead of changing based on the version of GCC, check for the presence of the macro instead.
Diffstat:
tmk_core/protocol/arm_atsam/usb/compiler.h | 4+++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 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