summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-21 14:32:15 +0200
committerNick Mathewson <nickm@torproject.org>2016-07-21 14:32:15 +0200
commit1d0775684d3faa0826f7a51f17f6e3442777e313 (patch)
tree4f4aa7cba336e60059d44df8e5a9c68919e03042
parent9c87869dde2fdae5ef624700a567c6ffc1e964c8 (diff)
downloadtor-1d0775684d3faa0826f7a51f17f6e3442777e313.tar.gz
tor-1d0775684d3faa0826f7a51f17f6e3442777e313.zip
Once more, 32-bit fixes on monotime mocking
-rw-r--r--src/common/compat_time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 011bc9e2a4..cc2c3c8a74 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -347,8 +347,8 @@ monotime_coarse_get(monotime_coarse_t *out)
{
#ifdef TOR_UNIT_TESTS
if (monotime_mocking_enabled) {
- out->ts_.tv_sec = mock_time_nsec_coarse / ONE_BILLION;
- out->ts_.tv_nsec = mock_time_nsec_coarse % ONE_BILLION;
+ out->ts_.tv_sec = (time_t) (mock_time_nsec_coarse / ONE_BILLION);
+ out->ts_.tv_nsec = (int) (mock_time_nsec_coarse % ONE_BILLION);
return;
}
#endif