summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorpatrickmt <40182064+patrickmt@users.noreply.github.com>2018-12-14 13:37:37 -0500
committerDrashna Jaelre <drashna@live.com>2018-12-14 12:47:17 -0800
commit118d5cc03f587dcf97740606f8b4552749f849bc (patch)
tree610d7024676d316fc0d6b756d6e85037550faeb5 /tmk_core
parent8f02375cc6ddfbbc6be384a9d5b1a9c91517099e (diff)
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.h2
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 d338439867..7d8350896b 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")