From 111900150d7e80f4f97f26ceb413aea2a5965d73 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 22 Dec 2014 16:42:55 -0500
Subject: [PATCH] work arounds to compile on linux
---
indra/llcommon/llprocessor.cpp | 2 +-
indra/llcommon/llsys.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index 1ee3c7edb05..e3e1d0c3918 100755
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -778,7 +778,7 @@ class LLProcessorInfoLinuxImpl : public LLProcessorInfoImpl
setInfo(eFamily, family);
}
- setInfo(eFamilyName, compute_CPUFamilyName(cpuinfo["vendor_id"].c_str(), family));
+ setInfo(eFamilyName, compute_CPUFamilyName(cpuinfo["vendor_id"].c_str(), family, 0));
// setInfo(eExtendedModel, getSysctlInt("machdep.cpu.extmodel"));
// setInfo(eBrandID, getSysctlInt("machdep.cpu.brand"));
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index c9db73eb99f..1a66612e878 100755
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -677,6 +677,7 @@ U32 LLOSInfo::getProcessVirtualSizeKB()
#if LL_WINDOWS
#endif
#if LL_LINUX
+# define STATUS_SIZE 2048
LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb");
if (status_filep)
{
--
GitLab