diff options
Diffstat (limited to 'tests/libtest/testutil.c')
| -rw-r--r-- | tests/libtest/testutil.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c index 63393c58..b18a6073 100644 --- a/tests/libtest/testutil.c +++ b/tests/libtest/testutil.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -19,8 +19,7 @@ * KIND, either express or implied. * ***************************************************************************/ - -#include "setup.h" +#include "curl_setup.h" #include "testutil.h" #include "memdebug.h" @@ -123,8 +122,11 @@ long tutil_tvdiff(struct timeval newer, struct timeval older) */ double tutil_tvdiff_secs(struct timeval newer, struct timeval older) { - return (double)(newer.tv_sec-older.tv_sec)+ - (double)(newer.tv_usec-older.tv_usec)/1000000.0; + if(newer.tv_sec != older.tv_sec) + return (double)(newer.tv_sec-older.tv_sec)+ + (double)(newer.tv_usec-older.tv_usec)/1000000.0; + else + return (double)(newer.tv_usec-older.tv_usec)/1000000.0; } /* return the number of seconds in the given input timeval struct */ |