summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-21 13:10:10 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-21 13:10:10 -0500
commitf2a5df252f3ba84f2bc98862fc35f9020ce78fd5 (patch)
treeb7754d58d8ca7b4dcd4e02be0251fdcc6a578ae8
parent8ede8d411a29450a746efdfb950c916b0058b497 (diff)
downloadtor-f2a5df252f3ba84f2bc98862fc35f9020ce78fd5.tar.gz
tor-f2a5df252f3ba84f2bc98862fc35f9020ce78fd5.zip
whoops; really fix the 32-bit builds
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 53f2c768d0..e3d6653d9e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4102,7 +4102,7 @@ have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem,
if (total_mem == 0) {
if (get_total_system_memory(&total_mem) < 0) {
total_mem = options->MaxMemInQueues >= SIZE_MAX ?
- SIZE_MAX : options->MaxMemInQueues;
+ SIZE_MAX : (size_t)options->MaxMemInQueues;
}
}
if (options->DirCache) {