|
Line
Link Here
|
| 0 |
-- qt-everywhere-opensource-src-4.8.6/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp |
0 |
++ qt-everywhere-opensource-src-4.8.6-uclibc/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp |
|
Lines 48-54
int main(int, char **)
Link Here
|
| 48 |
{ |
48 |
{ |
| 49 |
iconv_t x = iconv_open("", ""); |
49 |
iconv_t x = iconv_open("", ""); |
| 50 |
|
50 |
|
|
|
51 |
#ifdef __UCLIBC__ |
| 52 |
char *inp; |
| 53 |
#else |
| 51 |
const char *inp; |
54 |
const char *inp; |
|
|
55 |
#endif |
| 52 |
char *outp; |
56 |
char *outp; |
| 53 |
size_t inbytes, outbytes; |
57 |
size_t inbytes, outbytes; |
| 54 |
iconv(x, &inp, &inbytes, &outp, &outbytes); |
58 |
iconv(x, &inp, &inbytes, &outp, &outbytes); |
| 55 |
-- qt-everywhere-opensource-src-4.8.6/src/corelib/codecs/qiconvcodec.cpp |
59 |
++ qt-everywhere-opensource-src-4.8.6-uclibc/src/corelib/codecs/qiconvcodec.cpp |
|
Lines 219-225
QString QIconvCodec::convertToUnicode(co
Link Here
|
| 219 |
IconvState *state = *pstate; |
219 |
IconvState *state = *pstate; |
| 220 |
size_t inBytesLeft = len; |
220 |
size_t inBytesLeft = len; |
| 221 |
// best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM |
221 |
// best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM |
| 222 |
#ifdef GNU_LIBICONV |
222 |
#if defined(GNU_LIBICONV) && !defined(__UCLIBC__) |
| 223 |
// GNU doesn't disagree with POSIX :/ |
223 |
// GNU doesn't disagree with POSIX :/ |
| 224 |
const char *inBytes = chars; |
224 |
const char *inBytes = chars; |
| 225 |
#else |
225 |
#else |
|
Lines 318-324
static bool setByteOrder(iconv_t cd)
Link Here
|
| 318 |
size_t outBytesLeft = sizeof buf; |
318 |
size_t outBytesLeft = sizeof buf; |
| 319 |
size_t inBytesLeft = sizeof bom; |
319 |
size_t inBytesLeft = sizeof bom; |
| 320 |
|
320 |
|
| 321 |
#if defined(GNU_LIBICONV) |
321 |
#if defined(GNU_LIBICONV) && !defined(__UCLIBC__) |
| 322 |
const char **inBytesPtr = const_cast<const char **>(&inBytes); |
322 |
const char **inBytesPtr = const_cast<const char **>(&inBytes); |
| 323 |
#else |
323 |
#else |
| 324 |
char **inBytesPtr = &inBytes; |
324 |
char **inBytesPtr = &inBytes; |
|
Lines 338-344
QByteArray QIconvCodec::convertFromUnico
Link Here
|
| 338 |
char *outBytes; |
338 |
char *outBytes; |
| 339 |
size_t inBytesLeft; |
339 |
size_t inBytesLeft; |
| 340 |
|
340 |
|
| 341 |
#if defined(GNU_LIBICONV) |
341 |
#if defined(GNU_LIBICONV) && !defined(__UCLIBC__) |
| 342 |
const char **inBytesPtr = const_cast<const char **>(&inBytes); |
342 |
const char **inBytesPtr = const_cast<const char **>(&inBytes); |
| 343 |
#else |
343 |
#else |
| 344 |
char **inBytesPtr = &inBytes; |
344 |
char **inBytesPtr = &inBytes; |
