summaryrefslogtreecommitdiff
path: root/src/common/string_util.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-12-30 23:54:02 -0500
committerGravatar bunnei2014-12-30 23:54:02 -0500
commit29da5da9513c0faae0880d2fced18f80ef89923b (patch)
tree9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/string_util.cpp
parentMerge pull request #372 from lioncash/warn (diff)
parentFix MSVC-related #defines and add CMakeLists comment (diff)
downloadyuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.gz
yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.xz
yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.zip
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.cpp6
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 @@
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 _WIN32 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 _WIN32 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 _WIN32 413#ifdef _MSC_VER
414 414
415std::string UTF16ToUTF8(const std::u16string& input) 415std::string UTF16ToUTF8(const std::u16string& input)
416{ 416{