resolves conflicts in rgblight.c

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

diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h
index 8a4736d7bc19cbb833481649b467cc4da109e1ac..44ec3047ba5a03a0fdb33c39edee4085c7b7e92c 100644 (file)
--- a/tmk_core/common/action.h
+++ b/tmk_core/common/action.h
@@ -58,7 +58,14 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
 /* user defined special function */
 void action_function(keyrecord_t *record, uint8_t id, uint8_t opt);
 
+/* keyboard-specific key event (pre)processing */
+void process_action_kb(keyrecord_t *record);
+
 /* Utilities for actions.  */
+#if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS)
+extern bool disable_action_cache;
+#endif
+void process_action_nocache(keyrecord_t *record);
 void process_action(keyrecord_t *record);
 void register_code(uint8_t code);
 void unregister_code(uint8_t code);