summaryrefslogtreecommitdiff
path: root/src/openvpn/interval.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-07-29 14:11:02 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-07-29 14:11:02 +0200
commit64639e6dd78c89be61bbffeefcbd7a8d1e38178f (patch)
tree828e090fe91751afd157fb1ceb48c153dcb6568b /src/openvpn/interval.h
parent3408a277eb3293c0c29d50c66b42727ad31181aa (diff)
parent53de4f8356a1c5d5b2f0903499087adcc8854c57 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/openvpn/interval.h')
-rw-r--r--src/openvpn/interval.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvpn/interval.h b/src/openvpn/interval.h
index 826a08b..5623f3a 100644
--- a/src/openvpn/interval.h
+++ b/src/openvpn/interval.h
@@ -196,7 +196,7 @@ event_timeout_modify_wakeup(struct event_timeout *et, interval_t n)
static inline interval_t
event_timeout_remaining(struct event_timeout *et)
{
- return (int) et->last + et->n - now;
+ return (interval_t) (et->last - now + et->n);
}
/*