summaryrefslogtreecommitdiff
path: root/src/rexmpp_jingle.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/rexmpp_jingle.c')
-rw-r--r--src/rexmpp_jingle.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rexmpp_jingle.c b/src/rexmpp_jingle.c
index 3a72a95..8499dc8 100644
--- a/src/rexmpp_jingle.c
+++ b/src/rexmpp_jingle.c
@@ -1779,9 +1779,9 @@ int rexmpp_jingle_fds(rexmpp_t *s, fd_set *read_fds, fd_set *write_fds) {
return (nfds + 1);
}
-struct timeval * rexmpp_jingle_timeout (rexmpp_t *s,
- struct timeval *max_tv,
- struct timeval *tv) {
+struct timespec * rexmpp_jingle_timeout (rexmpp_t *s,
+ struct timespec *max_tv,
+ struct timespec *tv) {
#ifdef ENABLE_CALLS
gint poll_timeout;
GPollFD poll_fds[10];
@@ -1811,12 +1811,12 @@ struct timeval * rexmpp_jingle_timeout (rexmpp_t *s,
if (poll_timeout >= 0) {
int sec = poll_timeout / 1000;
- int usec = (poll_timeout % 1000) * 1000;
+ int nsec = (poll_timeout % 1000) * 1000000;
if (max_tv == NULL ||
(max_tv->tv_sec > sec ||
- (max_tv->tv_sec == sec && max_tv->tv_usec > usec))) {
+ (max_tv->tv_sec == sec && max_tv->tv_nsec > nsec))) {
tv->tv_sec = sec;
- tv->tv_usec = usec;
+ tv->tv_nsec = nsec;
max_tv = tv;
}
}