diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-08-29 05:54:02 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-08-29 05:54:02 -0500 |
| commit | 8ae076e66589c13fb64a0a08186beaee7d477006 (patch) | |
| tree | 46579b65531e1c07ee92737f87de3475e63a8f3c /Source/Core/Common/Src/StringUtil.cpp | |
| parent | c9afd83439304cf3d3a17f2f03a9f792a0bf62de (diff) | |
| parent | 18fd6905333a9edbe13c2eab8904aa74d0bd8dda (diff) | |
Merge branch 'iconv_static'
Diffstat (limited to 'Source/Core/Common/Src/StringUtil.cpp')
| -rw-r--r-- | Source/Core/Common/Src/StringUtil.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 25885552ef..3c0c01b25f 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -12,8 +12,6 @@ #ifdef _WIN32 #include <Windows.h> -#elif defined(ANDROID) - #else #include <iconv.h> #include <errno.h> @@ -454,9 +452,6 @@ std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>& input) { std::string result; -#if defined(ANDROID) - result = (char*)input.c_str(); -#else iconv_t const conv_desc = iconv_open("UTF-8", fromcode); if ((iconv_t)-1 == conv_desc) { @@ -505,7 +500,6 @@ std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>& input) iconv_close(conv_desc); } -#endif return result; } |