--- src/portable.cpp.orig 2008-06-09 06:43:07.000000000 -0400 +++ src/portable.cpp 2009-02-10 17:57:00.000000000 -0500 @@ -380,8 +380,7 @@ // libiconv is a mess. For some platforms/version the prototype of inbuf is // "const char **", for others it is "char **". C++ requires the proper cast to // avoid a compile error, that is were the CASTNEEDED is for. -#if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) && \ - !((defined(_OS_MAC_) || defined(Q_OS_MACX) )&& (_LIBICONV_VERSION==0x010B))) \ +#if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) ) \ || defined(_OS_SOLARIS_) \ || defined(_OS_NETBSD_) \ )