Home Explore Help
Register Sign In
HuiJun
/
qmk_firmware
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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.
patrickmt 6 years ago
parent
8f02375cc6
commit
118d5cc03f
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      tmk_core/protocol/arm_atsam/usb/compiler.h

+ 1 - 1
tmk_core/protocol/arm_atsam/usb/compiler.h
View File 

@@ -136,7 +136,7 @@
 
  */
 
  */
 
 #if defined(__CC_ARM)
 
 #if defined(__CC_ARM)
 
 #  define __always_inline             __forceinline
 
 #  define __always_inline             __forceinline
 
-#elif (defined __GNUC__)
 
+#elif (defined __GNUC__ && __GNUC__ <= 6)
 
 #  define __always_inline             __attribute__((__always_inline__))
 
 #  define __always_inline             __attribute__((__always_inline__))
 
 #elif (defined __ICCARM__)
 
 #elif (defined __ICCARM__)
 
 #  define __always_inline             _Pragma("inline=forced")
 
 #  define __always_inline             _Pragma("inline=forced")