diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-06-10 14:15:57 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-10 14:15:57 -0400 | 
| commit | a0be1e7dfbe74531becd49613351f9a688c8f908 (patch) | |
| tree | 89613775ded314a85434b7642230d29487938933 /indra/newview/llfloateruipreview.cpp | |
| parent | 3c7dde56e55bc36b3befe9fbf23fd1d50fdd68e2 (diff) | |
macOS 26 build changes (#4239)
* Fix for VLAs now emitting warnings on Xcode 26, and AGL being removed from the SDK.
Note: there was no warning or notice provided for AGL's removal.
* Whitespace.
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
| -rw-r--r-- | indra/newview/llfloateruipreview.cpp | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index 990a299c50..c3bc24c6b9 100644 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -1042,7 +1042,9 @@ void LLFloaterUIPreview::getExecutablePath(const std::vector<std::string>& filen          {              CFStringRef executable_cfstr = (CFStringRef)CFDictionaryGetValue(bundleInfoDict, CFSTR("CFBundleExecutable"));  // get the name of the actual executable (e.g. TextEdit or firefox-bin)              int max_file_length = 256;                                                                                      // (max file name length is 255 in OSX) -            char executable_buf[max_file_length]; + +            // Xcode 26: VLAs are a clang extension.  Just create the buffer and delete it after. +            char *executable_buf = new char [max_file_length];              if(CFStringGetCString(executable_cfstr, executable_buf, max_file_length, kCFStringEncodingMacRoman))            // convert CFStringRef to char*              {                  executable_path += std::string("/Contents/MacOS/") + std::string(executable_buf);                           // append path to executable directory and then executable name to exec path @@ -1052,6 +1054,7 @@ void LLFloaterUIPreview::getExecutablePath(const std::vector<std::string>& filen                  std::string warning = "Unable to get CString from CFString for executable path";                  popupAndPrintWarning(warning);              } +            delete [] executable_buf;          }          else          { | 
