diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-08 17:59:56 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-08 17:59:56 +0000 |
| commit | 543bb3ae4cd45d910b507ce70620f1dfac469173 (patch) | |
| tree | ee77f99c9da5de913b0bd30c53a028b052808755 /Source/Core/DiscIO/Src/BannerLoader.cpp | |
| parent | 75871dab653353dabd860c26e8c6243969363be8 (diff) | |
Glenn's iconv code seems to work fine on OS X.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5858 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/BannerLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/BannerLoader.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp index 346b28e9f7..40c4d7e278 100644 --- a/Source/Core/DiscIO/Src/BannerLoader.cpp +++ b/Source/Core/DiscIO/Src/BannerLoader.cpp @@ -26,9 +26,7 @@ // HyperIris: dunno if this suitable, may be need move. #ifdef WIN32 #include <Windows.h> -#endif - -#ifdef __linux__ +#else #include <iconv.h> #include <errno.h> #endif @@ -125,7 +123,7 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 delete[] buffer; } } -#elif defined(__linux__) +#else if (_src) { iconv_t conv_desc = iconv_open("UTF-8", "CP932"); @@ -185,8 +183,6 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 delete[] src_buffer_start; iconv_close(conv_desc); } -#elif defined(__APPLE__) - // TODO: Implement this (Maybe the linux code will work?) #endif return returnCode; } |