Ticket #18258: patch-portable.cpp.diff
| File patch-portable.cpp.diff, 0.6 KB (added by mcalhoun@…, 3 years ago) |
|---|
-
src/portable.cpp
old new 380 380 // libiconv is a mess. For some platforms/version the prototype of inbuf is 381 381 // "const char **", for others it is "char **". C++ requires the proper cast to 382 382 // 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) ) \ 385 384 || defined(_OS_SOLARIS_) \ 386 385 || defined(_OS_NETBSD_) \ 387 386 )