diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:52:07 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:52:07 +0800 |
| commit | c6048b2a8e18877f3f8bd0a7e190c553a3caa9a5 (patch) | |
| tree | 5e5b921f08012b20a5ae940d4f8ac4bd95e2f444 /indra/llcommon/llstring.h | |
| parent | 04081678eeaa1d56cecc1c68aa358d255addf81d (diff) | |
| parent | 09a3bac9436af1b6077fb27885c8c6c645f40a8e (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rw-r--r-- | indra/llcommon/llstring.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 7a8edc176d..2e579a4d2d 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -635,7 +635,11 @@ LL_COMMON_API std::string rawstr_to_utf8(const std::string& raw); // // This typedef may or may not be identical to std::wstring, depending on // LL_WCHAR_T_NATIVE. +#if __FreeBSD__ +typedef std::basic_string<char16_t> llutf16string; +#else typedef std::basic_string<U16> llutf16string; +#endif // Considering wchar_t, llwchar and U16, there are three relevant cases: #if LLWCHAR_IS_WCHAR_T // every which way but Windows |