diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:41:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:41:12 -0400 |
| commit | 375c05ac43ed56c8ad9670dfdfc801085075a2a2 (patch) | |
| tree | 2dcee4ef5757823430d5e234e23eedb1a3354d19 /indra/llcommon/llstring.h | |
| parent | a60875e549aa90f1cef450aabaf23570cf20a22e (diff) | |
| parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
merge changes for 3.7.5-release
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); |