summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-02-22 19:09:45 +0000
committerNick Mathewson <nickm@torproject.org>2008-02-22 19:09:45 +0000
commite7db789e82a7a2edc5c7e8230265f8ec83021f69 (patch)
treec8af0a1fe11383d565d916634a7c0d4c963ce4ec /src/or/main.c
parenta20eda5669cc5ce8b8c02d16ea80f642b7de64f9 (diff)
downloadtor-e7db789e82a7a2edc5c7e8230265f8ec83021f69.tar.gz
tor-e7db789e82a7a2edc5c7e8230265f8ec83021f69.zip
r14399@tombo: nickm | 2008-02-22 14:09:38 -0500
More 64-to-32 fixes. Partial backport candidate. still not done. svn:r13680
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 7b8448ea1d..faeca20f0a 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1190,7 +1190,7 @@ second_elapsed_callback(int fd, short event, void *args)
/* the second has rolled over. check more stuff. */
bytes_written = stats_prev_global_write_bucket - global_write_bucket;
bytes_read = stats_prev_global_read_bucket - global_read_bucket;
- seconds_elapsed = current_second ? (now.tv_sec - current_second) : 0;
+ seconds_elapsed = current_second ? (int)(now.tv_sec - current_second) : 0;
stats_n_bytes_read += bytes_read;
stats_n_bytes_written += bytes_written;
if (accounting_is_enabled(options) && seconds_elapsed >= 0)