diff options
| author | James Rowe <jroweboy@gmail.com> | 2016-08-01 23:13:35 +0200 |
|---|---|---|
| committer | James Rowe <jroweboy@gmail.com> | 2016-11-14 07:50:46 +0100 |
| commit | c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395 (patch) | |
| tree | 282996d714b4c104ae0270ba0c505160b05207d0 /src/common/string_util.cpp | |
| parent | Merge pull request #2171 from jroweboy/fix-mac-build (diff) | |
| download | yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.tar yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.tar.gz yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.tar.bz2 yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.tar.lz yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.tar.xz yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.tar.zst yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.zip | |
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 596ae01bf..df1008180 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 |