cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1291?usp=email )
Change subject: interval: Fix conversion warning ...................................................................... interval: Fix conversion warning 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 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg34464.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/interval.c 1 file changed, 1 insertion(+), 10 deletions(-) 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 -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1291?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I445b2e2cd14e55cc1ae3efdf1650b28e18992aa5 Gerrit-Change-Number: 1291 Gerrit-PatchSet: 6 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
