summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-06-06 09:34:28 +0800
committerErik Kundiman <erik@megapahit.org>2024-06-06 09:34:28 +0800
commitf3eb7559d62fbbee940ac89f34519cc39ea6c91d (patch)
treead1623f571058a4e0a1c16a213739768c405c568 /indra/llplugin
parent3f12069fb1df21781ad97b719cc6dbe86ea11b89 (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/llplugin')
-rw-r--r--indra/llplugin/llpluginsharedmemory.cpp2
-rw-r--r--indra/llplugin/slplugin/slplugin.cpp6
2 files changed, 4 insertions, 4 deletions
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;