diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2007-05-06 12:30:18 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2007-05-06 12:30:18 (GMT) |
| commit | 23c13fc17365dca77acbe9a992e03ae4a40f6eca (patch) | |
| tree | cfc812b095178411db5aae564fc43cac8b714078 /src/portable.cpp | |
| parent | 124b4621e793d9ffa3eca3ee91cdb6ded37c553e (diff) | |
| download | Doxygen-23c13fc17365dca77acbe9a992e03ae4a40f6eca.zip Doxygen-23c13fc17365dca77acbe9a992e03ae4a40f6eca.tar.gz Doxygen-23c13fc17365dca77acbe9a992e03ae4a40f6eca.tar.bz2 | |
Release-1.5.2-20070506
Diffstat (limited to 'src/portable.cpp')
| -rw-r--r-- | src/portable.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/portable.cpp b/src/portable.cpp index 8a0d6e5..dc276d1 100644 --- a/src/portable.cpp +++ b/src/portable.cpp @@ -373,16 +373,16 @@ void * portable_iconv_open(const char* tocode, const char* fromcode) size_t portable_iconv (void *cd, const char** inbuf, size_t *inbytesleft, char** outbuf, size_t *outbytesleft) { -#if (defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION==0x0109)) +#if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109)) || defined(_OS_SOLARIS_)) #define CASTNEEDED(x) (x) #else #define CASTNEEDED(x) (char **)(x) #endif - return iconv(cd,CASTNEEDED(inbuf),inbytesleft,outbuf,outbytesleft); + return iconv((iconv_t)cd,CASTNEEDED(inbuf),inbytesleft,outbuf,outbytesleft); } int portable_iconv_close (void *cd) { - return iconv_close(cd); + return iconv_close((iconv_t)cd); } |