diff options
| author | patrickmt <40182064+patrickmt@users.noreply.github.com> | 2018-12-14 19:37:37 +0100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-12-14 21:47:17 +0100 |
| commit | 118d5cc03f587dcf97740606f8b4552749f849bc (patch) | |
| tree | 610d7024676d316fc0d6b756d6e85037550faeb5 /tmk_core | |
| parent | 8f02375cc6ddfbbc6be384a9d5b1a9c91517099e (diff) | |
| download | qmk_firmware-118d5cc03f587dcf97740606f8b4552749f849bc.tar.gz qmk_firmware-118d5cc03f587dcf97740606f8b4552749f849bc.tar.xz | |
Fix macro redefinition for GNUC compilers > 6
GNUC compilers greater than version 6 already have the macro __always_inline defined. This fix checks GNUC version before defining the macro itself.
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/arm_atsam/usb/compiler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/protocol/arm_atsam/usb/compiler.h b/tmk_core/protocol/arm_atsam/usb/compiler.h index d33843986..7d8350896 100644 --- a/tmk_core/protocol/arm_atsam/usb/compiler.h +++ b/tmk_core/protocol/arm_atsam/usb/compiler.h @@ -136,7 +136,7 @@ */ #if defined(__CC_ARM) # define __always_inline __forceinline -#elif (defined __GNUC__) +#elif (defined __GNUC__ && __GNUC__ <= 6) # define __always_inline __attribute__((__always_inline__)) #elif (defined __ICCARM__) # define __always_inline _Pragma("inline=forced") |