aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-09-20 23:01:43 -0400
committerNick Mathewson <nickm@torproject.org>2009-09-20 23:01:43 -0400
commit93b33e15abc32998dd94cac2590b05bd48c5f34a (patch)
treea434fc2a9dc1999304f9d0f7070edaedaf962ba8
parent134266b984ae7a3f591a62cc0328fda270e1885c (diff)
downloadtor-93b33e15abc32998dd94cac2590b05bd48c5f34a.tar.gz
tor-93b33e15abc32998dd94cac2590b05bd48c5f34a.zip
Fix build warnings on OSX 10.5.8
-rw-r--r--src/or/test.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/test.c b/src/or/test.c
index 27ecc4757e..9bb54fadb3 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -3514,10 +3514,10 @@ test_circuit_timeout(void)
test_assert(circuit_build_times_network_check_live(&final));
if (circuit_build_times_add_timeout(&estimate, 0,
- approx_time()-estimate.timeout_ms/1000.0-1))
+ (time_t)(approx_time()-estimate.timeout_ms/1000.0-1)))
estimate.have_computed_timeout = 1;
if (circuit_build_times_add_timeout(&final, 0,
- approx_time()-final.timeout_ms/1000.0-1))
+ (time_t)(approx_time()-final.timeout_ms/1000.0-1)))
final.have_computed_timeout = 1;
}
@@ -3526,12 +3526,12 @@ test_circuit_timeout(void)
for ( ; i < NETWORK_NONLIVE_DISCARD_COUNT; i++) {
if (circuit_build_times_add_timeout(&estimate, 0,
- approx_time()-estimate.timeout_ms/1000.0-1))
+ (time_t)(approx_time()-estimate.timeout_ms/1000.0-1)))
estimate.have_computed_timeout = 1;
if (i < NETWORK_NONLIVE_DISCARD_COUNT-1) {
if (circuit_build_times_add_timeout(&final, 0,
- approx_time()-final.timeout_ms/1000.0-1))
+ (time_t)(approx_time()-final.timeout_ms/1000.0-1)))
final.have_computed_timeout = 1;
}
}