Browse Source
Move declaration of keymap_config.
Should really not declare variables in .h files - since it's included in different .c files, a proper linker then complains that the same variable is declared more than once (once for each .c file that the offending .h is included in).tags/v2.9
flabbergast
8 years ago
3 changed files with 4 additions and 1 deletions
+ 1
- 0
tmk_core/common/bootmagic.c
View File
| #include "eeconfig.h" | #include "eeconfig.h" | ||||
| #include "bootmagic.h" | #include "bootmagic.h" | ||||
| keymap_config_t keymap_config; | |||||
| void bootmagic(void) | void bootmagic(void) | ||||
| { | { |
+ 3
- 0
tmk_core/common/keymap.c
View File
| #include "debug.h" | #include "debug.h" | ||||
| #include "bootloader.h" | #include "bootloader.h" | ||||
| #ifdef BOOTMAGIC_ENABLE | |||||
| extern keymap_config_t keymap_config; | |||||
| #endif | |||||
| static action_t keycode_to_action(uint8_t keycode); | static action_t keycode_to_action(uint8_t keycode); | ||||
+ 0
- 1
tmk_core/common/keymap.h
View File
| bool nkro:1; | bool nkro:1; | ||||
| }; | }; | ||||
| } keymap_config_t; | } keymap_config_t; | ||||
| keymap_config_t keymap_config; | |||||
| #endif | #endif | ||||
Loading…