summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-01-22 16:28:12 +0000
committerNick Mathewson <nickm@torproject.org>2009-01-22 16:28:12 +0000
commit25c6ff6f559a177786591fff09750eef40e0600b (patch)
treebaaddd11f2097104f8dc50978a82cf44ae5b1948 /src/or
parent15d3c285034c105f826481f9e104a268651492bb (diff)
downloadtor-25c6ff6f559a177786591fff09750eef40e0600b.tar.gz
tor-25c6ff6f559a177786591fff09750eef40e0600b.zip
Support 64-bit time_t. Patch from Matthias Drochner. Partial backport candidate.
svn:r18234
Diffstat (limited to 'src/or')
-rw-r--r--src/or/circuituse.c2
-rw-r--r--src/or/main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index ac1a64ebfa..06a083ef0f 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -530,7 +530,7 @@ circuit_predict_and_launch_new(void)
void
circuit_build_needed_circs(time_t now)
{
- static long time_to_new_circuit = 0;
+ static time_t time_to_new_circuit = 0;
or_options_t *options = get_options();
/* launch a new circ for any pending streams that need one */
diff --git a/src/or/main.c b/src/or/main.c
index 353082749c..dd15024b7b 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1138,7 +1138,7 @@ second_elapsed_callback(int fd, short event, void *args)
* could use libevent's timers for this rather than checking the current
* time against a bunch of timeouts every second. */
static struct timeval one_second;
- static long current_second = 0;
+ static time_t current_second = 0;
time_t now;
size_t bytes_written;
size_t bytes_read;