summaryrefslogtreecommitdiff
path: root/tmk_core/common/action_util.c
diff options
context:
space:
mode:
authorcoderkun2017-05-06 12:19:45 +0200
committercoderkun2017-05-06 12:19:45 +0200
commit49046f621bc8304c8c7ba7a065d2568f45ecc616 (patch)
tree4a1fc5d37e012502ff4732c801381eec814a2e01 /tmk_core/common/action_util.c
parent9e7448ea89a1a88317f0acb805819af79d0a76e3 (diff)
parentc5cef025ec39e67408f000825747d88c6aaa86eb (diff)
Merge tag '0.5.43' into coderkun_neo2
Diffstat (limited to 'tmk_core/common/action_util.c')
-rw-r--r--tmk_core/common/action_util.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c
index cb4b25264..77848c092 100644
--- a/tmk_core/common/action_util.c
+++ b/tmk_core/common/action_util.c
@@ -58,9 +58,13 @@ void set_oneshot_locked_mods(int8_t mods) { oneshot_locked_mods = mods; }
void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; }
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
static int16_t oneshot_time = 0;
-inline bool has_oneshot_mods_timed_out() {
+bool has_oneshot_mods_timed_out(void) {
return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT;
}
+#else
+bool has_oneshot_mods_timed_out(void) {
+ return false;
+}
#endif
#endif