diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-07-19 23:28:12 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-07-19 23:28:12 +0000 |
commit | be8e1d238149c16d806b7a3434c100be3e1e1c22 (patch) | |
tree | 5b960fce5e253942404859ea45f63c509d960f33 /include | |
parent | 4dd44282048116871c708d8079e0fc3af137b311 (diff) |
restore proper difference calculation (bug #4746)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
-rwxr-xr-x | include/asterisk/time.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asterisk/time.h b/include/asterisk/time.h index a10636a69..dbdfb446a 100755 --- a/include/asterisk/time.h +++ b/include/asterisk/time.h @@ -32,7 +32,13 @@ typedef typeof(tv.tv_usec) ast_suseconds_t; AST_INLINE_API( int ast_tvdiff_ms(struct timeval end, struct timeval start), { - return ((end.tv_sec - start.tv_sec) * 1000) + ((end.tv_usec - start.tv_usec) / 1000); + /* the offset by 1,000,000 below is intentional... + it avoids differences in the way that division + is handled for positive and negative numbers, by ensuring + that the divisor is always positive + */ + return ((end.tv_sec - start.tv_sec) * 1000) + + (((1000000 + end.tv_usec - start.tv_usec) / 1000) - 1000); } ) |