From: Tim Kientzle <kientzle@gmail.com>
Date: Wed, 20 Apr 2011 06:18:46 +0000 (-0400)
Subject: Apparently, locale_charset() is broken on Mac OS.
X-Git-Tag: v3.0.0a~428
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57ee447d9be91c363444a38c97236aa788fe5155;p=thirdparty%2Flibarchive.git

Apparently, locale_charset() is broken on Mac OS.

SVN-Revision: 3258
---

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 3ec78b58c..08d0951d0 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -319,7 +319,8 @@ static const char *
 default_iconv_charset(const char *charset) {
 	if (charset != NULL && charset[0] != '\0')
 		return charset;
-#if HAVE_LOCALE_CHARSET
+#if HAVE_LOCALE_CHARSET && !defined(__APPLE__)
+	/* locale_charset() is broken on Mac OS */
 	return locale_charset();
 #elif HAVE_NL_LANGINFO
 	return nl_langinfo(CODESET);