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/llwindow/llwindowsdl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llwindow/llwindowsdl.cpp') 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 @@ -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) { -- cgit v1.2.3