diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-04-08 13:20:23 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-04-08 13:20:23 -0400 |
| commit | ea7f34d37ac1861fc1e48e11ca5030e424a05a85 (patch) | |
| tree | ef37281a22a1daec458eb8078287aad8a3af6063 /indra/llcommon/llstring.h | |
| parent | d10ecef615953bfa8739282958a62d4fac2c1290 (diff) | |
| parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rwxr-xr-x | indra/llcommon/llstring.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index f9702868c8..16a19e7021 100755 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -518,10 +518,13 @@ LL_COMMON_API S32 wchar_to_utf8chars(llwchar inchar, char* outchars); LL_COMMON_API std::string wstring_to_utf8str(const LLWString &utf32str, S32 len); LL_COMMON_API std::string wstring_to_utf8str(const LLWString &utf32str); - LL_COMMON_API std::string utf16str_to_utf8str(const llutf16string &utf16str, S32 len); LL_COMMON_API std::string utf16str_to_utf8str(const llutf16string &utf16str); +#if LL_WINDOWS +inline std::string wstring_to_utf8str(const llutf16string &utf16str) { return utf16str_to_utf8str(utf16str);} +#endif + // Length of this UTF32 string in bytes when transformed to UTF8 LL_COMMON_API S32 wstring_utf8_length(const LLWString& wstr); |