From f3eb7559d62fbbee940ac89f34519cc39ea6c91d Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Thu, 6 Jun 2024 09:34:28 +0800 Subject: Change LL_FREEBSD to already existing __FreeBSD__ So we don't need to have a custom environment -DLL_FREEBSD=1 setting. --- indra/llcommon/llsys.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llcommon/llsys.cpp') diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 1fc05dfdcd..459fe0c0c8 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -84,7 +84,7 @@ const char MEMINFO_FILE[] = "/proc/meminfo"; #ifdef __GNU__ # include #endif -#elif LL_FREEBSD +#elif __FreeBSD__ # include # include #endif @@ -786,7 +786,7 @@ static U32Kilobytes LLMemoryAdjustKBResult(U32Kilobytes inKB) } #endif -#if LL_DARWIN || LL_FREEBSD +#if LL_DARWIN || __FreeBSD__ // static U32Kilobytes LLMemoryInfo::getHardwareMemSize() { @@ -810,7 +810,7 @@ U32Kilobytes LLMemoryInfo::getPhysicalMemoryKB() const #if LL_WINDOWS return LLMemoryAdjustKBResult(U32Kilobytes(mStatsMap["Total Physical KB"].asInteger())); -#elif LL_DARWIN || LL_FREEBSD +#elif LL_DARWIN || __FreeBSD__ return getHardwareMemSize(); #elif LL_LINUX -- cgit v1.2.3