X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fcharsetconverter.cpp;h=f49213efe14abc07ad97216ca396992d8581b9c9;hb=07319f767b4c4f0e06e9957f217d5107b196617b;hp=b56eb2dc8edd3b50dbe802604c9e4d4dbef4502e;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git diff --git a/src/charsetconverter.cpp b/src/charsetconverter.cpp index b56eb2d..f49213e 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(__FreeBSD__)//|| 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);