Avoid collisions with X_* send string constants

diff --git a/users/konstantin/unicode.c b/users/konstantin/unicode.c
index 3b6164bc5135c48474d879352ba1c59323ffa576..44b5be6c9180959d01305a84239569d60b243e4c 100644 (file)
--- 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 d76f2a17004d428d46de915b8f10b7cb828e846e..6bb908e0e266b7c7e48ac7eff3aced55929f068f 100644 (file)
--- 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