diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
commit | 6fbf39f9b319106e39f80b8641acaba122d02e0a (patch) | |
tree | e47af1ff1bd1db52fd93c11d857b11387bacf01a /indra/llcommon/llstring.cpp | |
parent | 05200cf827d9a6263adc4905bf41a4905bce2659 (diff) | |
parent | 64a9ad0f5f52dac633a76e39335a7def2573b82e (diff) |
Merged in lmr4-merge-6.4.6 (pull request #213)
Merge master v6.4.6 into DRTVWR-497 (VS2017)
Diffstat (limited to 'indra/llcommon/llstring.cpp')
-rw-r--r-- | indra/llcommon/llstring.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index 0174c411b4..0290eea143 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -657,22 +657,6 @@ std::string utf8str_removeCRLF(const std::string& utf8str) } #if LL_WINDOWS -// documentation moved to header. Phoenix 2007-11-27 -namespace snprintf_hack -{ - int snprintf(char *str, size_t size, const char *format, ...) - { - va_list args; - va_start(args, format); - - int num_written = _vsnprintf(str, size, format, args); /* Flawfinder: ignore */ - va_end(args); - - str[size-1] = '\0'; // always null terminate - return num_written; - } -} - std::string ll_convert_wide_to_string(const wchar_t* in) { return ll_convert_wide_to_string(in, CP_UTF8); |