diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-01-15 21:24:55 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-01-15 21:24:55 -0800 |
| commit | 00aa2fee6d3841788d7146e5d6d66d0bceff9c3f (patch) | |
| tree | 18b6f33728d9a6521eab63a9c376b396c13aba49 /indra/llcommon | |
| parent | ea7e6a5174f1bdfc51ada864736d354706534d8b (diff) | |
Fixes from Windows build including utf-16 to utf-8 conversions.
Diffstat (limited to 'indra/llcommon')
| -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); |