summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Đorđević <vomindoraan@gmail.com>2019-02-12 00:18:52 +0100
committerKonstantin Đorđević <vomindoraan@gmail.com>2019-03-02 15:15:55 +0100
commit7b11d740eaad1aade1a8d1914aab54f2720ab7ba (patch)
tree78ebea9a2ee0b413572acfcf27a9cc5041b57f5e
parentddb0f39ebf317c7a23c69ed45efb1882746a01b0 (diff)
downloadqmk_firmware-7b11d740eaad1aade1a8d1914aab54f2720ab7ba.tar.gz
qmk_firmware-7b11d740eaad1aade1a8d1914aab54f2720ab7ba.tar.xz
Avoid collisions with X_* send string constants
-rw-r--r--users/konstantin/unicode.c2
-rw-r--r--users/konstantin/unicode.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/users/konstantin/unicode.c b/users/konstantin/unicode.c
index 3b6164bc5..44b5be6c9 100644
--- a/users/konstantin/unicode.c
+++ b/users/konstantin/unicode.c
@@ -2,6 +2,6 @@
#ifdef UNICODEMAP_ENABLE
const uint32_t PROGMEM unicode_map[] = {
- FOREACH_UNICODE(X_ENTRY)
+ FOREACH_UNICODE(UCM_ENTRY)
};
#endif
diff --git a/users/konstantin/unicode.h b/users/konstantin/unicode.h
index d76f2a170..6bb908e0e 100644
--- a/users/konstantin/unicode.h
+++ b/users/konstantin/unicode.h
@@ -13,9 +13,9 @@
#define UC_KEYCODE(name, code) name = UC(code),
-#define X_NAME(name, code) X_ ## name,
-#define X_ENTRY(name, code) [X_ ## name] = code,
-#define X_KEYCODE(name, code) name = X(X_ ## name),
+#define UCM_NAME(name, code) UCM_ ## name,
+#define UCM_ENTRY(name, code) [UCM_ ## name] = code,
+#define UCM_KEYCODE(name, code) name = X(UCM_ ## name),
#if defined(UNICODE_ENABLE)
enum unicode_keycodes {
@@ -23,12 +23,12 @@
};
#elif defined(UNICODEMAP_ENABLE)
enum unicode_names {
- FOREACH_UNICODE(X_NAME)
+ FOREACH_UNICODE(UCM_NAME)
};
extern const uint32_t PROGMEM unicode_map[];
enum unicode_keycodes {
- FOREACH_UNICODE(X_KEYCODE)
+ FOREACH_UNICODE(UCM_KEYCODE)
};
#endif