|
|
|
@ -478,15 +478,3 @@ Index: qtools/qxml.cpp
|
|
|
|
|
if ( !parseOk ) {
|
|
|
|
|
d->error = XMLERR_ERRORPARSINGCHOICE;
|
|
|
|
|
goto parseError;
|
|
|
|
|
Index: src/portable.cpp
|
|
|
|
|
--- src/portable.cpp.orig 2007-03-13 17:58:17 +0100
|
|
|
|
|
+++ src/portable.cpp 2007-06-08 09:16:58 +0200
|
|
|
|
|
@@ -373,7 +373,7 @@
|
|
|
|
|
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))
|
|
|
|
|
#define CASTNEEDED(x) (x)
|
|
|
|
|
#else
|
|
|
|
|
#define CASTNEEDED(x) (char **)(x)
|
|
|
|
|