diff options
author | tmk <nobody@nowhere> | 2014-11-14 22:53:25 +0900 |
---|---|---|
committer | tmk <nobody@nowhere> | 2014-11-14 22:53:25 +0900 |
commit | a58b9ddbd5b725fc603e0b796638a488cdb31b46 (patch) | |
tree | 62854faa3a90171d5c22cf46b77f2fb13eaa1038 /common | |
parent | 818070913275349c3906e2c4cdc3d69da5b7e132 (diff) | |
download | qmk_firmware-a58b9ddbd5b725fc603e0b796638a488cdb31b46.tar.gz qmk_firmware-a58b9ddbd5b725fc603e0b796638a488cdb31b46.zip |
Add initializer of debug_config for GCC < 4.6.0(#144)
Diffstat (limited to 'common')
-rw-r--r-- | common/debug.c | 13 | ||||
-rw-r--r-- | common/debug_config.h | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/common/debug.c b/common/debug.c index 2ed1006c5..18613fc28 100644 --- a/common/debug.c +++ b/common/debug.c | |||
@@ -4,12 +4,21 @@ | |||
4 | #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) | 4 | #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) |
5 | 5 | ||
6 | debug_config_t debug_config = { | 6 | debug_config_t debug_config = { |
7 | /* GCC Bug 10676 - Using unnamed fields in initializers | ||
8 | * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676 */ | ||
7 | #if GCC_VERSION >= 40600 | 9 | #if GCC_VERSION >= 40600 |
8 | /* GCC Bug 10676 - Using unnamed fields in initializers | ||
9 | * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676 */ | ||
10 | .enable = false, | 10 | .enable = false, |
11 | .matrix = false, | 11 | .matrix = false, |
12 | .keyboard = false, | 12 | .keyboard = false, |
13 | .mouse = false, | 13 | .mouse = false, |
14 | .reserved = 0 | ||
15 | #else | ||
16 | { | ||
17 | false, // .enable | ||
18 | false, // .matrix | ||
19 | false, // .keyboard | ||
20 | false, // .mouse | ||
21 | 0 // .reserved | ||
22 | } | ||
14 | #endif | 23 | #endif |
15 | }; | 24 | }; |
diff --git a/common/debug_config.h b/common/debug_config.h index 43e4c5c55..28bc34cd5 100644 --- a/common/debug_config.h +++ b/common/debug_config.h | |||
@@ -27,7 +27,6 @@ extern "C" { | |||
27 | 27 | ||
28 | /* NOTE: Not portable. Bit field order depends on implementation */ | 28 | /* NOTE: Not portable. Bit field order depends on implementation */ |
29 | typedef union { | 29 | typedef union { |
30 | uint8_t raw; | ||
31 | struct { | 30 | struct { |
32 | bool enable:1; | 31 | bool enable:1; |
33 | bool matrix:1; | 32 | bool matrix:1; |
@@ -35,6 +34,7 @@ typedef union { | |||
35 | bool mouse:1; | 34 | bool mouse:1; |
36 | uint8_t reserved:4; | 35 | uint8_t reserved:4; |
37 | }; | 36 | }; |
37 | uint8_t raw; | ||
38 | } debug_config_t; | 38 | } debug_config_t; |
39 | extern debug_config_t debug_config; | 39 | extern debug_config_t debug_config; |
40 | 40 | ||