diff options
| author | bunnei <bunneidev@gmail.com> | 2016-11-15 20:07:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 20:07:23 -0500 |
| commit | c728fccd9e11285b15ea7c8af27060bc48f23533 (patch) | |
| tree | 133bc7a610f8ae94a5381f8c8aaba6a6050d7ac1 /src/common/string_util.cpp | |
| parent | 2210744ec747aef7cbb720592949fb434caff1b7 (diff) | |
| parent | f0dcbd3f732770ea7949082a2afa9f1ea25403eb (diff) | |
Merge pull request #2172 from jroweboy/fix-mingw
Fix mingw compilation support
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 596ae01bf1..df1008180f 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -11,7 +11,8 @@ #include "common/common_paths.h" #include "common/logging/log.h" #include "common/string_util.h" -#ifdef _MSC_VER + +#ifdef _WIN32 #include <codecvt> #include <Windows.h> #include "common/common_funcs.h" @@ -270,7 +271,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st return result; } -#ifdef _MSC_VER +#ifdef _WIN32 std::string UTF16ToUTF8(const std::u16string& input) { #if _MSC_VER >= 1900 |