Mercurial > audlegacy
changeset 1725:b30feae3daee trunk
[svn] Seems like someone did a fix for Linux' iconv like I did for BSD's in another file. Added an #ifdef here, too.
author | js |
---|---|
date | Sat, 16 Sep 2006 19:10:07 -0700 |
parents | 77fd86d4382f |
children | 51eaea53b78c |
files | ChangeLog Plugins/Input/flac/plugin_common/charset.c |
diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Sep 16 18:58:23 2006 -0700 +++ b/ChangeLog Sat Sep 16 19:10:07 2006 -0700 @@ -1,3 +1,11 @@ +2006-09-17 01:58:23 +0000 Jonathan Schleifer <js@h3c.de> + revision [2385] + nenolod's fix for the soundcard.h check was incomplete, fixed + + Changes: Modified: + +2 -2 trunk/configure.ac + + 2006-09-17 01:56:17 +0000 William Pitcock <nenolod@nenolod.net> revision [2383] - check for soundcard.h
--- a/Plugins/Input/flac/plugin_common/charset.c Sat Sep 16 18:58:23 2006 -0700 +++ b/Plugins/Input/flac/plugin_common/charset.c Sat Sep 16 19:10:07 2006 -0700 @@ -89,7 +89,11 @@ outptr = out; retry: +#if defined __OpenBSD__ || defined __NetBSD__ + if (iconv(cd, &input, &length, &outptr, &outleft) == (size_t)-1) +#else if (iconv(cd, (char**)&input, &length, &outptr, &outleft) == (size_t)-1) +#endif { int used; switch (errno)