aboutsummaryrefslogtreecommitdiff
path: root/quantum/process_keycode/process_unicode.h
diff options
context:
space:
mode:
authorGergely Nagy <algernon@madhouse-project.org>2016-08-24 15:39:23 +0200
committerGergely Nagy <algernon@madhouse-project.org>2016-08-24 15:39:23 +0200
commita058ae40e268b34ba5db45f5fd5d557d50fa5437 (patch)
tree98cbba5d9b9d304e8bcc9384d418f71a1d2b8f0a /quantum/process_keycode/process_unicode.h
parenta9205484718ab2a74bc97884a2ea7b95882ed66d (diff)
downloadqmk_firmware-a058ae40e268b34ba5db45f5fd5d557d50fa5437.tar.gz
qmk_firmware-a058ae40e268b34ba5db45f5fd5d557d50fa5437.zip
quantum: Move qk_ucis_state to process_unicode.c
In order to not declare the same variable in multiple objects (which happens when building UCIS-enabled keymap for both the ErgoDox EZ and the ErgoDox Infinity), move the declaration to the .c file, and keep only an extern reference in the header. Many thanks to @fredizzimo for spotting the error in Travis, and suggesting the fix. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Diffstat (limited to 'quantum/process_keycode/process_unicode.h')
-rw-r--r--quantum/process_keycode/process_unicode.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h
index 85364e8eb..02ce3dd7e 100644
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@@ -29,11 +29,13 @@ typedef struct {
29 char *code; 29 char *code;
30} qk_ucis_symbol_t; 30} qk_ucis_symbol_t;
31 31
32struct { 32typedef struct {
33 uint8_t count; 33 uint8_t count;
34 uint16_t codes[UCIS_MAX_SYMBOL_LENGTH]; 34 uint16_t codes[UCIS_MAX_SYMBOL_LENGTH];
35 bool in_progress:1; 35 bool in_progress:1;
36} qk_ucis_state; 36} qk_ucis_state_t;
37
38extern qk_ucis_state_t qk_ucis_state;
37 39
38#define UCIS_TABLE(...) {__VA_ARGS__, {NULL, NULL}} 40#define UCIS_TABLE(...) {__VA_ARGS__, {NULL, NULL}}
39#define UCIS_SYM(name, code) {name, #code} 41#define UCIS_SYM(name, code) {name, #code}