aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorChris Young <chris.young@unsatisfactorysoftware.co.uk>2015-01-20 08:53:14 +0100
committerDaniel Stenberg <daniel@haxx.se>2015-01-20 08:53:14 +0100
commit089783c8383f401afef981500183a42eb9e10507 (patch)
tree59f03142c1dc5c5a896e19e18105f38e38bad69a /lib
parentbe57f689b0e9e2573e53df43140e8f3f7575571c (diff)
timeval: typecast for better type (on Amiga)
There is an issue with conflicting "struct timeval" definitions with certain AmigaOS releases and C libraries, depending on what gets included when. It's a minor difference - the OS one is unsigned, whereas the common structure has signed elements. If the OS one ends up getting defined, this causes a timing calculation error in curl. It's easy enough to resolve this at the curl end, by casting the potentially errorneous calculation to a signed long.
Diffstat (limited to 'lib')
-rw-r--r--lib/timeval.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/timeval.c b/lib/timeval.c
index 769eb3c49..45731ac59 100644
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -118,7 +118,7 @@ struct timeval curlx_tvnow(void)
long curlx_tvdiff(struct timeval newer, struct timeval older)
{
return (newer.tv_sec-older.tv_sec)*1000+
- (newer.tv_usec-older.tv_usec)/1000;
+ (long)(newer.tv_usec-older.tv_usec)/1000;
}
/*