From: <svn...@op...> - 2009-04-03 14:24:52
|
Author: henrik Date: Fri Apr 3 16:24:48 2009 New Revision: 5523 URL: http://www.opensync.org/changeset/5523 Log: Correct casting for iconv on Windows/MinGW Modified: format-plugins/vformat/src/vformat.c Modified: format-plugins/vformat/src/vformat.c ============================================================================== --- format-plugins/vformat/src/vformat.c Fri Apr 3 11:42:43 2009 (r5522) +++ format-plugins/vformat/src/vformat.c Fri Apr 3 16:24:48 2009 (r5523) @@ -259,7 +259,7 @@ if (charset) { cd = iconv_open("UTF-8", charset->str); -#if defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(_WIN32) if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { #else if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { @@ -287,7 +287,7 @@ /* because inbuf is not UTF-8, we think it is ISO-8859-1 */ cd = iconv_open("UTF-8", "ISO-8859-1"); -#if defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(_WIN32) if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { #else if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { |