aboutsummaryrefslogtreecommitdiff
path: root/src/common/compat.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-02-09 22:39:55 -0800
committerNick Mathewson <nickm@torproject.org>2015-02-09 22:39:55 -0800
commit5c820def993cad85d18e887af74087163d769f04 (patch)
treebd171301c04ce9bf3b3f8948d7a92c0a39f261dd /src/common/compat.c
parentf4c0735933699d899bd31c4e938862bcec7fd64c (diff)
parent9ae321db66cf83453b34c75d889599ea4a75642b (diff)
downloadtor-5c820def993cad85d18e887af74087163d769f04.tar.gz
tor-5c820def993cad85d18e887af74087163d769f04.zip
Merge remote-tracking branch 'sysrqb/bug14802_025'
Diffstat (limited to 'src/common/compat.c')
-rw-r--r--src/common/compat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/compat.c b/src/common/compat.c
index 5575316b2b..fde65d9d15 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -3161,7 +3161,7 @@ get_total_system_memory_impl(void)
size_t len = sizeof(memsize);
int mib[2] = {CTL_HW, HW_USERMEM};
if (sysctl(mib,2,&memsize,&len,NULL,0))
- return -1;
+ return 0;
return memsize;