diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-05-01 13:37:57 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-05-01 13:37:57 -0400 |
commit | 85a40040d11d9f0cd5353b32a3675d01bbd7f188 (patch) | |
tree | 23ec6e03404e178621b80b8a995529ab2ca1ad40 /evutil_time.c | |
parent | 57cbfcd67cc0d9d2549228ada97fd1362c18cfe7 (diff) | |
download | libevent-85a40040d11d9f0cd5353b32a3675d01bbd7f188.tar.gz |
Add regress_finalize to makefile.nmakerelease-2.1.3-alpha
Diffstat (limited to 'evutil_time.c')
-rw-r--r-- | evutil_time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/evutil_time.c b/evutil_time.c index f677dafc..937e7e37 100644 --- a/evutil_time.c +++ b/evutil_time.c @@ -443,14 +443,14 @@ evutil_gettime_monotonic_(struct evutil_monotonic_timer *base, * accurate as we can; adjust_monotnonic_time() below * will keep it monotonic. */ counter_usec_elapsed = ticks_elapsed * 1000; - base->first_counter = counter.QuadPart - counter_usec_elapsed / base->usec_per_count; + base->first_counter = (ev_uint64_t) (counter.QuadPart - counter_usec_elapsed / base->usec_per_count); } - tp->tv_sec = counter_usec_elapsed / 1000000; + tp->tv_sec = (time_t) (counter_usec_elapsed / 1000000); tp->tv_usec = counter_usec_elapsed % 1000000; } else { /* We're just using GetTickCount(). */ - tp->tv_sec = ticks / 1000; + tp->tv_sec = (time_t) (ticks / 1000); tp->tv_usec = (ticks % 1000) * 1000; } adjust_monotonic_time(base, tp); |