diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2007-05-06 12:30:18 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2007-05-06 12:30:18 (GMT) |
| commit | 0b087b99d43fb3803b26407d771ca32e6cf5c34b (patch) | |
| tree | cfc812b095178411db5aae564fc43cac8b714078 /src/portable.cpp | |
| parent | 80f45b6274c81f9cfd1772e5039005124ae04fab (diff) | |
| download | Doxygen-0b087b99d43fb3803b26407d771ca32e6cf5c34b.zip Doxygen-0b087b99d43fb3803b26407d771ca32e6cf5c34b.tar.gz Doxygen-0b087b99d43fb3803b26407d771ca32e6cf5c34b.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); } |