From: Frank Lichtenheld <[email protected]> Use correct return type of the function.
Change-Id: I445b2e2cd14e55cc1ae3efdf1650b28e18992aa5 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1291 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1291 This mail reflects revision 5 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <[email protected]> diff --git a/src/openvpn/interval.c b/src/openvpn/interval.c index fbefcd9..f9953a6 100644 --- a/src/openvpn/interval.c +++ b/src/openvpn/interval.c @@ -38,11 +38,6 @@ top->horizon = horizon; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - bool event_timeout_trigger(struct event_timeout *et, struct timeval *tv, const int et_const_retry) { @@ -52,7 +47,7 @@ } bool ret = false; - time_t wakeup = event_timeout_remaining(et); + interval_t wakeup = event_timeout_remaining(et); if (wakeup <= 0) { @@ -82,7 +77,3 @@ } return ret; } - -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
