Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added check for iconv() version; fixed strconv.cpp to compile with both prototypes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-04-24 22:16:24 +00:00
parent 1309ba6c7e
commit 95c8801cdf
3 changed files with 649 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/strconv.cpp
View File

@@ -456,7 +456,11 @@ public:
if (buf)
{
// have destination buffer, convert there
#ifdef WX_ICONV_TAKES_CHAR
cres = iconv( m2w, (char**)&psz, &inbuf, (char**)&buf, &outbuf );
#else
cres = iconv( m2w, &psz, &inbuf, (char**)&buf, &outbuf );
#endif
res = n-(outbuf/SIZEOF_WCHAR_T);
// convert to native endianness
WC_BSWAP(buf, res)
@@ -469,7 +473,11 @@ public:
res = 0;
do {
buf = tbuf; outbuf = 8*SIZEOF_WCHAR_T;
#ifdef WX_ICONV_TAKES_CHAR
cres = iconv( m2w, (char**)&psz, &inbuf, (char**)&buf, &outbuf );
#else
cres = iconv( m2w, &psz, &inbuf, (char**)&buf, &outbuf );
#endif
res += 8-(outbuf/SIZEOF_WCHAR_T);
} while ((cres==(size_t)-1) && (errno==E2BIG));
}
@@ -504,7 +512,11 @@ public:
if (buf)
{
// have destination buffer, convert there
#ifdef WX_ICONV_TAKES_CHAR
cres = iconv( w2m, (char**)&psz, &inbuf, &buf, &outbuf );
#else
cres = iconv( w2m, (const char**)&psz, &inbuf, &buf, &outbuf );
#endif
res = n-outbuf;
}
else
@@ -515,7 +527,11 @@ public:
res = 0;
do {
buf = tbuf; outbuf = 16;
#ifdef WX_ICONV_TAKES_CHAR
cres = iconv( w2m, (char**)&psz, &inbuf, &buf, &outbuf );
#else
cres = iconv( w2m, (const char**)&psz, &inbuf, &buf, &outbuf );
#endif
res += 16 - outbuf;
} while ((cres==(size_t)-1) && (errno==E2BIG));
}
@@ -748,7 +764,11 @@ public:
{
size_t inbuf = strlen(psz);
size_t outbuf = n;
#ifdef WX_ICONV_TAKES_CHAR
size_t res = iconv( cnv, (char**)&psz, &inbuf, &buf, &outbuf );
#else
size_t res = iconv( cnv, &psz, &inbuf, &buf, &outbuf );
#endif
if (res==(size_t)-1) return (size_t)-1;
return n-outbuf;
}