version 0.2.15

[fms.git] / src / charsetconverter.cpp

diff --git a/src/charsetconverter.cpp b/src/charsetconverter.cpp
index f6f73d4..4685add 100644 (file)
--- a/src/charsetconverter.cpp
+++ b/src/charsetconverter.cpp
@@ -39,6 +39,7 @@ const bool CharsetConverter::SetConversion(const std::string &fromcharset, const
        {\r
                m_fromcharset="";\r
                m_tocharset="";\r
+               return false;\r
        }\r
 }\r
 \r
@@ -48,7 +49,7 @@ const bool CharsetConverter::Convert(const std::string &input, std::string &outp
        {\r
                std::vector<char> invec(input.begin(),input.end());\r
                std::vector<char> outvec(invec.size()*4,0);\r
-#ifdef _WIN32\r
+#if defined(_WIN32) || defined(__APPLE__) || defined(__DARWIN__)\r
                const char *inptr=&invec[0];\r
 #else\r
                char *inptr=&invec[0];\r