From 004280ba11aff30043710ac112eccd78c5ba5c4f Mon Sep 17 00:00:00 2001 From: Jeremy Messenger Date: Wed, 3 Jan 2007 02:19:22 +0000 Subject: -Update to 4.40.0. -Use USE_DOS2UNIX and get rid of ^M in our files/patch-*. -INSTALLS_SHLIB -> USE_LDCONFIG. --- audio/wavpack/files/patch-wavpack.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'audio/wavpack/files/patch-wavpack.c') diff --git a/audio/wavpack/files/patch-wavpack.c b/audio/wavpack/files/patch-wavpack.c index c6da495ee3e6..5a9a166ea527 100644 --- a/audio/wavpack/files/patch-wavpack.c +++ b/audio/wavpack/files/patch-wavpack.c @@ -1,22 +1,22 @@ $FreeBSD$ ---- wavpack.c.orig -+++ wavpack.c +--- cli/wavpack.c.orig ++++ cli/wavpack.c @@ -1604,6 +1604,7 @@ - MultiByteToWideChar (CP_ACP, 0, string, -1, temp, max_chars + 1); - WideCharToUTF8 (temp, (uchar *) string, len); - #else -+ iconv_t converter; - char *temp = malloc (len); - char *outp = temp; - char *inp = string; + MultiByteToWideChar (CP_ACP, 0, string, -1, temp, max_chars + 1); + WideCharToUTF8 (temp, (uchar *) string, len); + #else ++ iconv_t converter; + char *temp = malloc (len); + char *outp = temp; + char *inp = string; @@ -1614,7 +1615,7 @@ - - memset(temp, 0, len); - old_locale = setlocale (LC_CTYPE, ""); -- iconv_t converter = iconv_open ("UTF-8", ""); -+ converter = iconv_open ("UTF-8", ""); - err = iconv (converter, &inp, &insize, &outp, &outsize); - iconv_close (converter); - setlocale (LC_CTYPE, old_locale); + + memset(temp, 0, len); + old_locale = setlocale (LC_CTYPE, ""); +- iconv_t converter = iconv_open ("UTF-8", ""); ++ converter = iconv_open ("UTF-8", ""); + err = iconv (converter, &inp, &insize, &outp, &outsize); + iconv_close (converter); + setlocale (LC_CTYPE, old_locale); -- cgit v1.2.3