[or-cvs] [tor/master] Fix build warnings on OSX 10.5.8

Nick Mathewson nickm at seul.org
Mon Sep 21 03:01:21 UTC 2009


Author: Nick Mathewson <nickm at torproject.org>
Date: Sun, 20 Sep 2009 23:01:43 -0400
Subject: Fix build warnings on OSX 10.5.8
Commit: 93b33e15abc32998dd94cac2590b05bd48c5f34a

---
 src/or/test.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/test.c b/src/or/test.c
index 27ecc47..9bb54fa 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;
       }
     }
-- 
1.5.6.5



More information about the tor-commits mailing list