summaryrefslogtreecommitdiffstats
path: root/tmk_core/protocol/arm_atsam/usb/compiler.h
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-26 01:36:28 +0100
committerAlex Ong <the.onga@gmail.com>2019-01-26 01:36:28 +0100
commitd977daa8dc9136746425f9e1414e1f93cb161877 (patch)
tree209ab8082580e5fdf37f1a8b7c1169250b7548c0 /tmk_core/protocol/arm_atsam/usb/compiler.h
parent47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff)
parent0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff)
downloadqmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.gz
qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.xz
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'tmk_core/protocol/arm_atsam/usb/compiler.h')
-rw-r--r--tmk_core/protocol/arm_atsam/usb/compiler.h4
1 files changed, 3 insertions, 1 deletions
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