X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fcharsetconverter.cpp;h=9e4ff6f3ed96376aa28075326048a099062930e1;hb=023b2219068d481cd6a300982427c99bacd88a12;hp=30262076b1bfbff8c617a149c141b09200f9cf94;hpb=0236076defe60bcd4b3a25c23efa53c21993a48e;p=fms.git diff --git a/src/charsetconverter.cpp b/src/charsetconverter.cpp index 3026207..9e4ff6f 100644 --- a/src/charsetconverter.cpp +++ b/src/charsetconverter.cpp @@ -49,7 +49,7 @@ const bool CharsetConverter::Convert(const std::string &input, std::string &outp { std::vector invec(input.begin(),input.end()); std::vector outvec(invec.size()*4,0); -#if defined(_WIN32) || defined(__APPLE__) || defined(__DARWIN__) +#if defined(_WIN32) //|| defined(__APPLE__) || defined(__DARWIN__) const char *inptr=&invec[0]; #else char *inptr=&invec[0]; @@ -57,6 +57,7 @@ const bool CharsetConverter::Convert(const std::string &input, std::string &outp char *outptr=&outvec[0]; size_t insize=invec.size(); size_t outsize=outvec.size(); + size_t rval=0; rval=iconv(m_iconv,&inptr,&insize,&outptr,&outsize);