From abae027538dd98952247385f4aa54ae168f6168a Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Thu, 20 Oct 2016 10:35:29 +0200 Subject: [PATCH] Fix compiler error on FreeBSD --- ChangeLog.txt | 5 +++++ src/cpp-utils/system/get_total_memory.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ebc970ec..18157dfa 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Version 0.9.7 (unreleased) +-------------- +Compatibility: +* Runs on FreeBSD + Version 0.9.6 --------------- Fixed bugs: diff --git a/src/cpp-utils/system/get_total_memory.cpp b/src/cpp-utils/system/get_total_memory.cpp index 46a7f0c2..0be4086f 100644 --- a/src/cpp-utils/system/get_total_memory.cpp +++ b/src/cpp-utils/system/get_total_memory.cpp @@ -14,7 +14,7 @@ namespace cpputils{ if (0 != result) { throw std::runtime_error("sysctlbyname syscall failed"); } -#elif __linux__ +#elif __linux__ || __FreeBSD__ long numRAMPages = sysconf(_SC_PHYS_PAGES); long pageSize = sysconf(_SC_PAGESIZE); mem = numRAMPages * pageSize;