diff options
| author | joerg <joerg> | 2006-03-06 21:53:04 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-03-06 21:53:04 +0000 |
| commit | 8dc22f6e81065232d45d548b6a10153a8467d8ad (patch) | |
| tree | 44afec0dd56ca1fcddcd7b317ca0700827c81e7b /wm | |
| parent | 27526cc99d77cebdcaeeb6cdc1a921bedc3c8cd8 (diff) | |
| download | pkgsrc-8dc22f6e81065232d45d548b6a10153a8467d8ad.tar.gz | |
Use the const char ** as second argument to iconv(3) only on NetBSD,
POSIX says it is char **.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/icewm/distinfo | 3 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-aa | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo index 50842e47ce9..3e57dfac53b 100644 --- a/wm/icewm/distinfo +++ b/wm/icewm/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.27 2006/02/16 08:24:11 ghen Exp $ +$NetBSD: distinfo,v 1.28 2006/03/06 21:53:04 joerg Exp $ SHA1 (icewm-1.2.25.tar.gz) = 04d3555ec0c2e0fc4e782893f6b1ca8d5dfdcacd RMD160 (icewm-1.2.25.tar.gz) = 58bab630875aea02c64c2ca9bcbe80cf2338cdb3 Size (icewm-1.2.25.tar.gz) = 1042790 bytes +SHA1 (patch-aa) = 4a7a1f2efe756ab187219176a587f8fc3ae5b236 SHA1 (patch-ac) = 2da6c567f809db9292e123f7233e4bd767ddb26c SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424 diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa new file mode 100644 index 00000000000..8aa3f7d4bc4 --- /dev/null +++ b/wm/icewm/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.6 2006/03/06 21:53:04 joerg Exp $ + +--- src/ylocale.cc.orig 2006-02-03 06:24:27.000000000 +0000 ++++ src/ylocale.cc +@@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC + char * inbuf((char *) lStr), * outbuf((char *) uStr); + size_t inlen(lLen), outlen(4 * lLen); + ++#if defined(__NetBSD__) + if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen)) ++#else ++ if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) ++#endif + warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno)); + + *((YUChar *) outbuf) = 0; |