diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-30 23:54:02 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-30 23:54:02 -0500 |
| commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
| tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/string_util.cpp | |
| parent | 74d7b45d09c172bdb6dce665903537a784acb110 (diff) | |
| parent | 5d10b212ecebb15fb1463edc08c725d8e29fa44a (diff) | |
Merge pull request #369 from darkf/mingw_
Fix MinGW build (2)
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 d919b7a4c..b3b772bd9 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -7,7 +7,7 @@ #include "common/common.h" #include "common/string_util.h" -#ifdef _WIN32 +#ifdef _MSC_VER #include <Windows.h> #include <codecvt> #else @@ -45,7 +45,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar { int writtenCount; -#ifdef _WIN32 +#ifdef _MSC_VER // You would think *printf are simple, right? Iterate on each character, // if it's a format specifier handle it properly, etc. // @@ -410,7 +410,7 @@ std::string UriEncode(const std::string & sSrc) return sResult; } -#ifdef _WIN32 +#ifdef _MSC_VER std::string UTF16ToUTF8(const std::u16string& input) { |