Change LL_FREEBSD to already existing __FreeBSD__

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

25 files changed, 44 insertions, 44 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
 
diff --git a/indra/llfilesystem/lldir_linux.h b/indra/llfilesystem/lldir_linux.h
index c8fc12c9a0..f9b0427ccd 100644
--- a/indra/llfilesystem/lldir_linux.h
+++ b/indra/llfilesystem/lldir_linux.h
@@ -24,7 +24,7 @@
  * $/LicenseInfo$
  */
 
-#if !LL_LINUX && !LL_FREEBSD
+#if !LL_LINUX && !__FreeBSD__
 #error This header must not be included when compiling for any target other than Linux. Consider including lldir.h instead.
 #endif // !LL_LINUX
 
diff --git a/indra/llplugin/llpluginsharedmemory.cpp b/indra/llplugin/llpluginsharedmemory.cpp
index b7efc0aa48..1d5f52c394 100644
--- a/indra/llplugin/llpluginsharedmemory.cpp
+++ b/indra/llplugin/llpluginsharedmemory.cpp
@@ -49,7 +49,7 @@
     #define USE_APR_SHARED_MEMORY 1
 #elif LL_LINUX
     #define USE_SHM_OPEN_SHARED_MEMORY 1
-#elif LL_FREEBSD
+#elif __FreeBSD__
     #define USE_SHM_OPEN_SHARED_MEMORY 1
 #endif
 
diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp
index e7b686dac2..d20e01c231 100644
--- a/indra/llplugin/slplugin/slplugin.cpp
+++ b/indra/llplugin/slplugin/slplugin.cpp
@@ -46,7 +46,7 @@ using namespace std;
     #include "slplugin-objc.h"
 #endif
 
-#if LL_DARWIN || LL_LINUX || LL_FREEBSD
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
     #include <signal.h>
 #endif
 
@@ -64,7 +64,7 @@ using namespace std;
     Now that SLPlugin is a bundled app on the Mac, this is no longer necessary (it can just use a regular Info.plist file), but I'm leaving this comment in for posterity.
 */
 
-#if LL_DARWIN || LL_LINUX || LL_FREEBSD
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
 // Signal handlers to make crashes not show an OS dialog...
 static void crash_handler(int sig)
 {
@@ -182,7 +182,7 @@ int main(int argc, char **argv)
     // display a crash message if something bad happens. The host app will
     // see the missing heartbeat and log appropriately.
     initExceptionHandler();
-#elif LL_DARWIN || LL_LINUX || LL_FREEBSD
+#elif LL_DARWIN || LL_LINUX || __FreeBSD__
     if(argc < 2)
     {
         LL_ERRS("slplugin") << "usage: " << argv[0] << " launcher_port" << LL_ENDL;
diff --git a/indra/llrender/llfontfreetypesvg.cpp b/indra/llrender/llfontfreetypesvg.cpp
index eefc1dd29b..1672aa4b96 100644
--- a/indra/llrender/llfontfreetypesvg.cpp
+++ b/indra/llrender/llfontfreetypesvg.cpp
@@ -34,13 +34,13 @@
 #endif
 
 #define NANOSVG_IMPLEMENTATION
-#if LL_FREEBSD
+#if __FreeBSD__
 #include <nanosvg.h>
 #else
 #include <nanosvg/nanosvg.h>
 #endif
 #define NANOSVGRAST_IMPLEMENTATION
-#if LL_FREEBSD
+#if __FreeBSD__
 #include <nanosvgrast.h>
 #else
 #include <nanosvg/nanosvgrast.h>
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 14dd60eaa2..10920f1de3 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1164,7 +1164,7 @@ bool LLGLManager::initGL()
         mIsNVIDIA = TRUE;
     }
     else if (mGLVendor.find("INTEL") != std::string::npos
-#if LL_LINUX || LL_FREEBSD
+#if LL_LINUX || __FreeBSD__
          // The Mesa-based drivers put this in the Renderer string,
          // not the Vendor string.
          || mGLRenderer.find("INTEL") != std::string::npos
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
index 71f8711d23..a397de499e 100644
--- a/indra/llrender/llglheaders.h
+++ b/indra/llrender/llglheaders.h
@@ -27,7 +27,7 @@
 #ifndef LL_LLGLHEADERS_H
 #define LL_LLGLHEADERS_H
 
-#if LL_MESA || LL_LINUX || LL_FREEBSD
+#if LL_MESA || LL_LINUX || __FreeBSD__
 //----------------------------------------------------------------------------
 // MESA headers
 // quotes so we get libraries/.../GL/ version
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index f6b1f7383e..f7079d574c 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -51,7 +51,7 @@ extern "C" {
 # include "fontconfig/fontconfig.h"
 }
 
-#if LL_LINUX || LL_FREEBSD
+#if LL_LINUX || __FreeBSD__
 // not necessarily available on random SDL platforms, so #if LL_LINUX
 // for execv(), waitpid(), fork()
 # include <unistd.h>
@@ -2660,7 +2660,7 @@ LLSD LLWindowSDL::getNativeKeyData()
 
 #endif // LL_GTK
 
-#if LL_LINUX || LL_FREEBSD
+#if LL_LINUX || __FreeBSD__
 // extracted from spawnWebBrowser for clarity and to eliminate
 //  compiler confusion regarding close(int fd) vs. LLWindow::close()
 void exec_cmd(const std::string& cmd, const std::string& arg)
@@ -2716,7 +2716,7 @@ void LLWindowSDL::spawnWebBrowser(const std::string& escaped_url, bool async)
 
     LL_INFOS() << "spawn_web_browser: " << escaped_url << LL_ENDL;
 
-#if LL_LINUX || LL_FREEBSD
+#if LL_LINUX || __FreeBSD__
 # if LL_X11
     if (mSDL_Display)
     {
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 60b48de70d..5922130266 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -263,7 +263,7 @@ using namespace LL;
 // define a self-registering event API object
 #include "llappviewerlistener.h"
 
-#if (LL_LINUX || LL_FREEBSD) && LL_GTK
+#if (LL_LINUX || __FreeBSD__) && LL_GTK
 #include "glib.h"
 #endif // (LL_LINUX) && LL_GTK
 
@@ -309,7 +309,7 @@ S32 gLastExecDuration = -1; // (<0 indicates unknown)
 #   define LL_PLATFORM_KEY "mac"
 #elif LL_LINUX
 #   define LL_PLATFORM_KEY "lnx"
-#elif LL_FREEBSD
+#elif __FreeBSD__
 #   define LL_PLATFORM_KEY "bsd"
 #else
 #   error "Unknown Platform"
@@ -887,7 +887,7 @@ bool LLAppViewer::init()
     std::string mime_types_name;
 #if LL_DARWIN
     mime_types_name = "mime_types_mac.xml";
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
     mime_types_name = "mime_types_linux.xml";
 #else
     mime_types_name = "mime_types.xml";
@@ -1729,7 +1729,7 @@ bool LLAppViewer::cleanup()
     // one because it happens just after mFastTimerLogThread is deleted. This
     // comment is in case we guessed wrong, so we can move it here instead.
 
-#if LL_LINUX || LL_FREEBSD
+#if LL_LINUX || __FreeBSD__
     // remove any old breakpad minidump files from the log directory
     if (! isError())
     {
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 94fb5fefe5..8c2181292f 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -37,7 +37,7 @@
 #include "llviewercontrol.h"
 #include "llwin32headerslean.h"
 
-#if LL_LINUX || LL_DARWIN || LL_FREEBSD
+#if LL_LINUX || LL_DARWIN || __FreeBSD__
 # include "llfilepicker.h"
 #endif
 
@@ -187,7 +187,7 @@ std::string LLDirPicker::getDirName()
     return mFilePicker->getFirstFile();
 }
 
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
 
 LLDirPicker::LLDirPicker() :
     mFileName(NULL),
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index 814e27af45..82adbcce11 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -78,7 +78,7 @@ private:
     void buildDirname( void );
     bool check_local_file_access_enabled();
 
-#if LL_LINUX || LL_DARWIN || LL_FREEBSD
+#if LL_LINUX || LL_DARWIN || __FreeBSD__
     // On Linux we just implement LLDirPicker on top of LLFilePicker
     LLFilePicker *mFilePicker;
 #endif
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 6fb68b91f3..a900e6e1ca 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -62,7 +62,7 @@
 
 #if LL_DARWIN
 const char FEATURE_TABLE_FILENAME[] = "featuretable_mac.txt";
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
 const char FEATURE_TABLE_FILENAME[] = "featuretable_linux.txt";
 #else
 const char FEATURE_TABLE_FILENAME[] = "featuretable.txt";
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 0ae0d870e5..e659a55abe 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -40,7 +40,7 @@
 #include "llwindowsdl.h" // for some X/GTK utils to help with filepickers
 #endif // LL_SDL
 
-#if LL_LINUX || LL_FREEBSD
+#if LL_LINUX || __FreeBSD__
 #include "llhttpconstants.h"    // file picker uses some of thes constants on Linux
 #endif
 
@@ -1093,7 +1093,7 @@ BOOL LLFilePicker::getSaveFileModeless(ESaveFilter filter,
 }
 //END LL_DARWIN
 
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
 
 # if LL_GTK
 
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
index fa1f3c3ab0..a7ce549bdf 100644
--- a/indra/newview/llviewerjointmesh.cpp
+++ b/indra/newview/llviewerjointmesh.cpp
@@ -56,7 +56,7 @@
 #include "llmatrix4a.h"
 #include "llperfstats.h"
 
-#if !LL_DARWIN && !LL_LINUX && !LL_FREEBSD
+#if !LL_DARWIN && !LL_LINUX && !__FreeBSD__
 extern PFNGLWEIGHTPOINTERARBPROC glWeightPointerARB;
 extern PFNGLWEIGHTFVARBPROC glWeightfvARB;
 extern PFNGLVERTEXBLENDARBPROC glVertexBlendARB;