diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2021-11-29 20:51:58 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2021-11-29 20:51:58 +0100 |
| commit | 6e3e95a9da9458ddf0874b4bd1c8ce6b47fcef27 (patch) | |
| tree | 6e3667709d99f857d90b9831426f6a32ee70d113 /src/openvpn/event.c | |
| parent | b29f419d68b26b75a44e3ac00748875f1003b900 (diff) | |
| parent | f2b3dda12a731c2e0971cb7889728edaf23f6cb0 (diff) | |
Merge branch 'upstream' into develop
Diffstat (limited to 'src/openvpn/event.c')
| -rw-r--r-- | src/openvpn/event.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openvpn/event.c b/src/openvpn/event.c index b22741f..fcddeb1 100644 --- a/src/openvpn/event.c +++ b/src/openvpn/event.c @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2018 OpenVPN Inc <sales@openvpn.net> + * Copyright (C) 2002-2021 OpenVPN Inc <sales@openvpn.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -1041,10 +1041,10 @@ se_wait_fast(struct event_set *es, const struct timeval *tv, struct event_set_re struct timeval tv_tmp = *tv; int stat; - dmsg(D_EVENT_WAIT, "SE_WAIT_FAST maxfd=%d tv=%d/%d", + dmsg(D_EVENT_WAIT, "SE_WAIT_FAST maxfd=%d tv=%" PRIi64 "/%ld", ses->maxfd, - (int)tv_tmp.tv_sec, - (int)tv_tmp.tv_usec); + (int64_t)tv_tmp.tv_sec, + (long)tv_tmp.tv_usec); stat = select(ses->maxfd + 1, &ses->readfds, &ses->writefds, NULL, &tv_tmp); @@ -1065,8 +1065,8 @@ se_wait_scalable(struct event_set *es, const struct timeval *tv, struct event_se fd_set write = ses->writefds; int stat; - dmsg(D_EVENT_WAIT, "SE_WAIT_SCALEABLE maxfd=%d tv=%d/%d", - ses->maxfd, (int)tv_tmp.tv_sec, (int)tv_tmp.tv_usec); + dmsg(D_EVENT_WAIT, "SE_WAIT_SCALEABLE maxfd=%d tv=%" PRIi64 "/%ld", + ses->maxfd, (int64_t)tv_tmp.tv_sec, (long)tv_tmp.tv_usec); stat = select(ses->maxfd + 1, &read, &write, NULL, &tv_tmp); |