Ticket #18258: patch-portable.cpp.diff

File patch-portable.cpp.diff, 657 bytes (added by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez), 15 years ago)

  • src/portable.cpp

    old new  
    380380// libiconv is a mess. For some platforms/version the prototype of inbuf is
    381381// "const char **", for others it is "char **". C++ requires the proper cast to
    382382// avoid a compile error, that is were the CASTNEEDED is for.
    383 #if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) && \
    384       !((defined(_OS_MAC_) || defined(Q_OS_MACX) )&& (_LIBICONV_VERSION==0x010B))) \
     383#if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) ) \
    385384    || defined(_OS_SOLARIS_) \
    386385    || defined(_OS_NETBSD_)  \
    387386    )