summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorDamien <Dbroqua@users.noreply.github.com>2017-04-13 13:26:02 +0200
committerGitHub <noreply@github.com>2017-04-13 13:26:02 +0200
commita43cb6c0af3ac616903172c4b8932bfc5ee4939b (patch)
treec3ca94b544ab832507b37b6268bb04f7f7eedb4a /tmk_core
parent3e41cde9f99778ca30c03b97470c32780379db43 (diff)
parentd3301c0f8b0005738ab9aa2030d83739ffb5c4b6 (diff)
Merge pull request #20 from qmk/master
Merge from QMK
Diffstat (limited to 'tmk_core')
-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 cb4b252648..77848c0923 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