diff options
Diffstat (limited to 'editors/abiword/patches/patch-ab')
| -rw-r--r-- | editors/abiword/patches/patch-ab | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab index ba031be14b3..4cfa0ff31c7 100644 --- a/editors/abiword/patches/patch-ab +++ b/editors/abiword/patches/patch-ab @@ -1,15 +1,13 @@ -$NetBSD: patch-ab,v 1.9 2004/03/30 00:53:31 reed Exp $ +$NetBSD: patch-ab,v 1.10 2005/01/11 11:09:27 adam Exp $ ---- src/af/util/xp/ut_types.h.orig 2003-10-21 09:25:23.000000000 -0700 -+++ src/af/util/xp/ut_types.h -@@ -259,7 +259,9 @@ ABI_EXPORT void * UT_calloc ( UT_uint32 - (defined (__MACH__) && defined (__APPLE__)) || \ - (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \ - defined(__BEOS__) || defined (__AIX__) || \ --(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) -+(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) || \ -+defined(__NetBSD__) || \ -+(defined(_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x0109) - - #define ICONV_CONST const +--- src/af/util/xp/ut_iconv.cpp.orig 2004-11-22 10:42:04.000000000 +0000 ++++ src/af/util/xp/ut_iconv.cpp +@@ -339,7 +339,7 @@ size_t UT_iconv( UT_iconv_t cd, const ch + #ifdef UT_ICONV_USING_GLIB + return g_iconv((GIConv)cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft); #else +- return iconv( (iconv_t)cd, (ICONV_CONST char **)inbuf, inbytesleft, outbuf, outbytesleft ); ++ return iconv( (iconv_t)cd, (const char **)inbuf, inbytesleft, outbuf, outbytesleft ); + #endif + } + |