diff options
Diffstat (limited to 'cpp/include/Ice/IconvStringConverter.h')
| -rw-r--r-- | cpp/include/Ice/IconvStringConverter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h index 2ab569ebbb4..ed197218699 100644 --- a/cpp/include/Ice/IconvStringConverter.h +++ b/cpp/include/Ice/IconvStringConverter.h @@ -20,7 +20,7 @@ #include <langinfo.h> #endif -#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || (defined(__sun) && !defined(_XPG6)) || defined(__FreeBSD__) +#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__) // // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962 // @@ -243,7 +243,7 @@ IconvStringConverter<charT>::toUTF8(const charT* sourceStart, const charT* sourc #ifdef NDEBUG iconv(cd, 0, 0, 0, 0); #else - int rs = iconv(cd, 0, 0, 0, 0); + size_t rs = iconv(cd, 0, 0, 0, 0); assert(rs == 0); #endif @@ -296,7 +296,7 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B #ifdef NDEBUG iconv(cd, 0, 0, 0, 0); #else - int rs = iconv(cd, 0, 0, 0, 0); + size_t rs = iconv(cd, 0, 0, 0, 0); assert(rs == 0); #endif |