From: tmk <hasu@tmk-kbd.com>
Date: Thu, 14 Sep 2017 03:58:06 +0000 (+0900)
Subject: core: Fix for build option NO_ACTION_LAYER
X-Git-Url: https://git.gir.st/tmk_keyboard.git/commitdiff_plain/45f6e5cb97fd975c68df4b16e935a42e474efeee?ds=sidebyside

core: Fix for build option NO_ACTION_LAYER
---

diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c
index 46401eba..31d659b7 100644
--- a/tmk_core/common/action_layer.c
+++ b/tmk_core/common/action_layer.c
@@ -122,9 +122,8 @@ void layer_debug(void)
 /* return layer effective for key at this time */
 static uint8_t current_layer_for_key(keypos_t key)
 {
-    action_t action = ACTION_TRANSPARENT;
-
 #ifndef NO_ACTION_LAYER
+    action_t action = ACTION_TRANSPARENT;
     uint32_t layers = layer_state | default_layer_state;
     /* check top layer first */
     for (int8_t i = 31; i >= 0; i--) {
diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h
index ba8b0638..2811cd7c 100644
--- a/tmk_core/common/action_layer.h
+++ b/tmk_core/common/action_layer.h
@@ -34,10 +34,6 @@ void default_layer_set(uint32_t state);
 void default_layer_or(uint32_t state);
 void default_layer_and(uint32_t state);
 void default_layer_xor(uint32_t state);
-#else
-#define default_layer_or(state)
-#define default_layer_and(state)
-#define default_layer_xor(state)
 #endif
 
 
@@ -56,18 +52,6 @@ void layer_invert(uint8_t layer);
 void layer_or(uint32_t state);
 void layer_and(uint32_t state);
 void layer_xor(uint32_t state);
-#else
-#define layer_state             0
-#define layer_clear()
-#define layer_move(layer)
-#define layer_on(layer)
-#define layer_off(layer)
-#define layer_invert(layer)
-
-#define layer_or(state)
-#define layer_and(state)
-#define layer_xor(state)
-#define layer_debug()
 #endif