Change LL_FREEBSD to already existing __FreeBSD__

So we don't need to have a custom environment -DLL_FREEBSD=1 setting.

12 files changed, 21 insertions, 21 deletions

diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index 28a90c8d69..7ceb57336e 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -43,7 +43,7 @@
 
 #if LL_WINDOWS
 #include "lltimer.h"
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
 #include <sys/time.h>
 #include <sched.h>
 #include "lltimer.h"
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index baadb59b4f..607509ea2d 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -159,7 +159,7 @@ public:
 #endif // (LL_LINUX) && !(defined(__i386__) || defined(__amd64__))
 
 
-#if (LL_LINUX || LL_DARWIN || LL_FREEBSD) && (defined(__i386__) || defined(__amd64__))
+#if (LL_LINUX || LL_DARWIN || __FreeBSD__) && (defined(__i386__) || defined(__amd64__))
     //
     // Mac+Linux FAST x86 implementation of CPU clock
     static U32 getCPUClockCount32()
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index cc14caa48d..b73030d978 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -52,7 +52,7 @@ class LLMutex ;
 #define LL_DEFAULT_HEAP_ALIGN 8
 #elif LL_DARWIN
 #define LL_DEFAULT_HEAP_ALIGN 16
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
 #define LL_DEFAULT_HEAP_ALIGN 8
 #endif
 
@@ -89,7 +89,7 @@ template <typename T> T* LL_NEXT_ALIGNED_ADDRESS_64(T* address)
         (uintptr_t(address) + 0x3F) & ~0x3F);
 }
 
-#if LL_LINUX || LL_DARWIN || LL_FREEBSD
+#if LL_LINUX || LL_DARWIN || __FreeBSD__
 
 #define         LL_ALIGN_PREFIX(x)
 #define         LL_ALIGN_POSTFIX(x)     __attribute__((aligned(x)))
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index da8b633fae..83cd6941dc 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -32,11 +32,11 @@
 #ifdef LL_LINUX
 #define __ENABLE_WSTRING
 #include <endian.h>
-#elif defined(LL_FREEBSD)
+#elif defined(__FreeBSD__)
 #include <sys/endian.h>
 #endif  //  LL_LINUX
 
-#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)) || (defined(LL_FREEBSD) && (_BYTE_ORDER == _LITTLE_ENDIAN)))
+#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)) || (defined(__FreeBSD__) && (_BYTE_ORDER == _LITTLE_ENDIAN)))
 #define LL_LITTLE_ENDIAN 1
 #else
 #define LL_BIG_ENDIAN 1
@@ -82,7 +82,7 @@
 #endif
 
 // Deal with minor differences on Unixy OSes.
-#if LL_DARWIN || LL_LINUX || LL_FREEBSD
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
     // Different name, same functionality.
     #define stricmp strcasecmp
     #define strnicmp strncasecmp
diff --git a/indra/llcommon/llprocess.h b/indra/llcommon/llprocess.h
index 36bc764e87..dcd316cb0f 100644
--- a/indra/llcommon/llprocess.h
+++ b/indra/llcommon/llprocess.h
@@ -40,7 +40,7 @@
 
 #if LL_WINDOWS
 #include "llwin32headerslean.h" // for HANDLE
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
 #if defined(Status)
 #undef Status
 #endif
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index dee8e0d42b..35d08d8de9 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -801,7 +801,7 @@ private:
     }
 };
 
-#elif LL_FREEBSD
+#elif __FreeBSD__
 
 #include <sys/sysctl.h>
 class LLProcessorInfoFreeBSDImpl : public LLProcessorInfoImpl
@@ -1075,7 +1075,7 @@ LLProcessorInfo::LLProcessorInfo() : mImpl(NULL)
 #elif LL_DARWIN
         static LLProcessorInfoDarwinImpl the_impl;
         mImpl = &the_impl;
-#elif LL_FREEBSD
+#elif __FreeBSD__
         static LLProcessorInfoFreeBSDImpl the_impl;
         mImpl = &the_impl;
 #else
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 4845fd210d..fb6b6bd589 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -36,7 +36,7 @@
 #   include <winsock2.h>    // for htonl
 #elif LL_LINUX
 #   include <netinet/in.h>
-#elif LL_DARWIN || LL_FREEBSD
+#elif LL_DARWIN || __FreeBSD__
 #   include <arpa/inet.h>
 #endif
 
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 <gnu/libc-version.h>
 #endif
-#elif LL_FREEBSD
+#elif __FreeBSD__
 #	include <sys/sysctl.h>
 #	include <sys/utsname.h>
 #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
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h
index 59081960c0..7338b0f0cb 100644
--- a/indra/llcommon/llsys.h
+++ b/indra/llcommon/llsys.h
@@ -130,7 +130,7 @@ public:
     void stream(std::ostream& s) const; ///< output text info to s
 
     U32Kilobytes getPhysicalMemoryKB() const;
-#if LL_DARWIN || LL_FREEBSD
+#if LL_DARWIN || __FreeBSD__
     static U32Kilobytes getHardwareMemSize(); // Because some Mac linkers won't let us reference extern gSysMemory from a different lib.
 #endif
 
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index 1f644d0a1e..00a04d87b6 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -35,7 +35,7 @@
 
 #if LL_WINDOWS
 #   include "llwin32headerslean.h"
-#elif LL_LINUX || LL_DARWIN || LL_FREEBSD
+#elif LL_LINUX || LL_DARWIN || __FreeBSD__
 #   include <errno.h>
 #   include <sys/time.h>
 #else
@@ -115,7 +115,7 @@ void ms_sleep(U32 ms)
 
 #endif
 
-#elif LL_LINUX || LL_DARWIN || LL_FREEBSD
+#elif LL_LINUX || LL_DARWIN || __FreeBSD__
 static void _sleep_loop(struct timespec& thiswait)
 {
     struct timespec nextwait;
@@ -233,7 +233,7 @@ F64 calc_clock_frequency()
 #endif // LL_WINDOWS
 
 
-#if LL_LINUX || LL_DARWIN || LL_FREEBSD
+#if LL_LINUX || LL_DARWIN || __FreeBSD__
 // Both Linux and Mac use gettimeofday for accurate time
 F64 calc_clock_frequency()
 {
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index f3874b1fa4..be2e51560e 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -606,7 +606,7 @@ S32 LLUUID::getNodeID(unsigned char* node_id)
 #define HAVE_NETINET_IN_H
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
-#if !LL_DARWIN && !LL_FREEBSD
+#if !LL_DARWIN && !__FreeBSD__
 #include <linux/sockios.h>
 #endif
 #endif
diff --git a/indra/llcommon/stdtypes.h b/indra/llcommon/stdtypes.h
index b95e8f222a..b40a718593 100644
--- a/indra/llcommon/stdtypes.h
+++ b/indra/llcommon/stdtypes.h
@@ -72,7 +72,7 @@ typedef unsigned __int64        U64;
 #else
 typedef long long int           S64;
 typedef long long unsigned int      U64;
-#if LL_DARWIN || LL_LINUX || LL_FREEBSD
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
 #define S64L(a)             (a##LL)
 #define U64L(a)             (a##ULL)
 #endif
@@ -114,7 +114,7 @@ typedef U32             TPACKETID;
 #define FALSE           (0)
 #endif
 
-#if LL_FREEBSD
+#if __FreeBSD__
 #undef NULL
 #endif