di0ib/tmk_keyboard_custom
Archived
1
0
Fork 0
Code Releases Activity

Move declaration of keymap_config.

Browse Source 
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).
This commit is contained in:
flabbergast 2015-10-12 09:46:48 +01:00
parent d9652cdf99
commit cb663eeca6
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tmk_core/common/bootmagic.c
View File

@ -10,6 +10,7 @@
#include "eeconfig.h" #include "eeconfig.h"
#include "bootmagic.h" #include "bootmagic.h"
keymap_config_t keymap_config;
void bootmagic(void) void bootmagic(void)
{ {

3
tmk_core/common/keymap.c
View File

@ -24,6 +24,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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);

1
tmk_core/common/keymap.h
View File

@ -38,7 +38,6 @@ typedef union {
bool nkro:1; bool nkro:1;
}; };
} keymap_config_t; } keymap_config_t;
keymap_config_t keymap_config;
#endif #endif