Apparently, locale_charset() is broken on Mac OS.

SVN-Revision: 3258

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 3ec78b58c71ca3c30651f6bd730039d0bd1b5280..08d0951d045ee10bdbddf311bf4ee1bdab6058af 100644 (file)
--- 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);