[Keymap] Smarter KC_MAKE code and removed duplicate MOD_MASK entries (#5331)

[qmk_firmware.git] / tmk_core / common / action_layer.h

diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h
index 6d48321f9278269ab0bab81cd2b5d90a6da76c1e..6e2f35d90d1185ddd249c4c16e2d8fc17e986b78 100644 (file)
--- a/tmk_core/common/action_layer.h
+++ b/tmk_core/common/action_layer.h
@@ -82,12 +82,10 @@ void layer_xor(uint32_t state);
 #define layer_or(state)
 #define layer_and(state)
 #define layer_xor(state)
+#endif
 
-__attribute__((weak))
 uint32_t layer_state_set_user(uint32_t state);
-__attribute__((weak))
 uint32_t layer_state_set_kb(uint32_t state);
-#endif
 
 /* pressed actions cache */
 #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE)
@@ -99,7 +97,7 @@ uint8_t read_source_layers_cache(keypos_t key);
 action_t store_or_get_action(bool pressed, keypos_t key);
 
 /* return the topmost non-transparent layer currently associated with key */
-int8_t layer_switch_get_layer(keypos_t key);
+uint8_t layer_switch_get_layer(keypos_t key);
 
 /* return action depending on current layer status */
 action_t layer_switch_get_action(keypos_t key);