--- libopensync-0.22/formats/vformats-xml/vformat.c 2007-06-17 10:54:54 +0000 +++ libopensync-0.22/formats/vformats-xml/vformat.c 2007-06-17 10:55:30 +0000 @@ -236,7 +236,7 @@ if (charset) { cd = iconv_open("UTF-8", charset->str); -#ifdef SOLARIS +#if defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__) if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { #else if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { @@ -264,7 +264,7 @@ /* because inbuf is not UTF-8, we think it is ISO-8859-1 */ cd = iconv_open("UTF-8", "ISO-8859-1"); -#ifdef SOLARIS +#if defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__) if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { #else if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {