diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-09-07 13:08:26 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-09-07 13:08:26 +0300 |
| commit | e6f3cfe247912b27e9c8087da631a2f9d20b56b4 (patch) | |
| tree | f8f4aabcc768649b6acbe0d85a91d315c33875ef /indra | |
| parent | 534ce82eb68a1412e062399172ae22b55c0a9fc2 (diff) | |
mac and linux build fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 55138e48ee..6cc9e804d4 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -271,7 +271,12 @@ bool LLApp::parseCommandOptions(int argc, wchar_t** wargv) } int offset = 1; if(wargv[ii][1] == '-') ++offset; - name.assign(utf16str_to_utf8str(&wargv[ii][offset])); + +#if LL_WINDOWS + name.assign(utf16str_to_utf8str(&wargv[ii][offset])); +#else + name.assign(wstring_to_utf8str(&wargv[ii][offset])); +#endif if(((ii+1) >= argc) || (wargv[ii+1][0] == '-')) { // we found another option after this one or we have @@ -290,7 +295,12 @@ bool LLApp::parseCommandOptions(int argc, wchar_t** wargv) continue; } ++ii; - value.assign(utf16str_to_utf8str(wargv[ii])); + +#if LL_WINDOWS + value.assign(utf16str_to_utf8str((wargv[ii]))); +#else + value.assign(wstring_to_utf8str((wargv[ii]))); +#endif #if LL_WINDOWS //Windows changed command line parsing. Deal with it. |