Merge remote-tracking branch 'upstream/develop'

1 files changed, 3 insertions, 5 deletions

diff --git a/quantum/keycode_config.h b/quantum/keycode_config.h
index d1352c302e..804f1381d0 100644
--- a/quantum/keycode_config.h
+++ b/quantum/keycode_config.h
@@ -16,9 +16,7 @@
 
 #pragma once
 
-#ifdef __cplusplus
-#    define _Static_assert static_assert
-#endif
+#include "compiler_support.h"
 
 #include "eeconfig.h"
 #include "keycode.h"
@@ -28,7 +26,7 @@ uint16_t keycode_config(uint16_t keycode);
 uint8_t  mod_config(uint8_t mod);
 
 /* NOTE: Not portable. Bit field order depends on implementation */
-typedef union {
+typedef union keymap_config_t {
     uint16_t raw;
     struct {
         bool swap_control_capslock : 1;
@@ -47,6 +45,6 @@ typedef union {
     };
 } keymap_config_t;
 
-_Static_assert(sizeof(keymap_config_t) == sizeof(uint16_t), "Keycode (magic) EECONFIG out of spec.");
+STATIC_ASSERT(sizeof(keymap_config_t) == sizeof(uint16_t), "Keycode (magic) EECONFIG out of spec.");
 
 extern keymap_config_t keymap_config;