diff options
| author | Callum Prentice <callum@mbp.localdomain> | 2023-01-26 10:37:59 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@mbp.localdomain> | 2023-01-26 10:37:59 -0800 |
| commit | fb00bce81ad201b5f1798ff5d5afe8c4dcabda54 (patch) | |
| tree | a157a9f0ec2648cf7d2281a8019b52b8468111f9 /indra/llcommon/llstring.h | |
| parent | 66f59478d09122ddf43c4ba3445754d1698bf016 (diff) | |
| parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) | |
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rw-r--r-- | indra/llcommon/llstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 093d7cb9ab..9afbea9afe 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -666,7 +666,7 @@ ll_convert_forms(ll_convert_alias, LLWString, std::string, utf8str_to_ // Same function, better name. JC inline LLWString utf8string_to_wstring(const std::string& utf8_string) { return utf8str_to_wstring(utf8_string); } -LL_COMMON_API S32 wchar_to_utf8chars(llwchar inchar, char* outchars); +LL_COMMON_API std::ptrdiff_t wchar_to_utf8chars(llwchar inchar, char* outchars); ll_convert_forms(ll_convert_alias, std::string, LLWString, wstring_to_utf8str); ll_convert_forms(ll_convert_u16_alias, std::string, llutf16string, utf16str_to_utf8str); |