diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-06-06 09:34:28 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-06-06 09:34:28 +0800 |
| commit | f3eb7559d62fbbee940ac89f34519cc39ea6c91d (patch) | |
| tree | ad1623f571058a4e0a1c16a213739768c405c568 /indra/newview/llappviewer.cpp | |
| parent | 3f12069fb1df21781ad97b719cc6dbe86ea11b89 (diff) | |
Change LL_FREEBSD to already existing __FreeBSD__
So we don't need to have a custom environment -DLL_FREEBSD=1 setting.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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()) { |