diff options
| author | 2014-12-29 19:59:14 -0800 | |
|---|---|---|
| committer | 2014-12-29 20:12:03 -0800 | |
| commit | 5d10b212ecebb15fb1463edc08c725d8e29fa44a (patch) | |
| tree | 206a1417e59815789eca81249734b0eb5497d5e3 /src/common/string_util.cpp | |
| parent | Fix merge conflicts (diff) | |
| download | yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.gz yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.xz yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.zip | |
Fix MSVC-related #defines and add CMakeLists comment
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 0dd2d2349..b3b772bd9 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include "common/common.h" | 7 | #include "common/common.h" |
| 8 | #include "common/string_util.h" | 8 | #include "common/string_util.h" |
| 9 | 9 | ||
| 10 | #ifdef MSVC_VER | 10 | #ifdef _MSC_VER |
| 11 | #include <Windows.h> | 11 | #include <Windows.h> |
| 12 | #include <codecvt> | 12 | #include <codecvt> |
| 13 | #else | 13 | #else |
| @@ -45,7 +45,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar | |||
| 45 | { | 45 | { |
| 46 | int writtenCount; | 46 | int writtenCount; |
| 47 | 47 | ||
| 48 | #ifdef MSVC_VER | 48 | #ifdef _MSC_VER |
| 49 | // You would think *printf are simple, right? Iterate on each character, | 49 | // You would think *printf are simple, right? Iterate on each character, |
| 50 | // if it's a format specifier handle it properly, etc. | 50 | // if it's a format specifier handle it properly, etc. |
| 51 | // | 51 | // |
| @@ -410,7 +410,7 @@ std::string UriEncode(const std::string & sSrc) | |||
| 410 | return sResult; | 410 | return sResult; |
| 411 | } | 411 | } |
| 412 | 412 | ||
| 413 | #ifdef MSVC_VER | 413 | #ifdef _MSC_VER |
| 414 | 414 | ||
| 415 | std::string UTF16ToUTF8(const std::u16string& input) | 415 | std::string UTF16ToUTF8(const std::u16string& input) |
| 416 | { | 416 | { |