~ruther/qmk_firmware

7b11d740eaad1aade1a8d1914aab54f2720ab7ba — Konstantin Đorđević 6 years ago ddb0f39
Avoid collisions with X_* send string constants
2 files changed, 6 insertions(+), 6 deletions(-)

M users/konstantin/unicode.c
M users/konstantin/unicode.h
M users/konstantin/unicode.c => users/konstantin/unicode.c +1 -1
@@ 2,6 2,6 @@

#ifdef UNICODEMAP_ENABLE
  const uint32_t PROGMEM unicode_map[] = {
    FOREACH_UNICODE(X_ENTRY)
    FOREACH_UNICODE(UCM_ENTRY)
  };
#endif

M users/konstantin/unicode.h => users/konstantin/unicode.h +5 -5
@@ 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