31 lines
1 KiB
Diff
31 lines
1 KiB
Diff
|
From 334a01e3f8bcfb6da15352b5a067098ee78709d8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: jinfeihan57 <38484902+jinfeihan57@users.noreply.github.com>
|
||
|
|
Date: Wed, 21 Oct 2020 16:36:31 +0800
|
||
|
|
Subject: [PATCH] fix issue #78
|
||
|
|
|
||
|
|
---
|
||
|
|
CPP/7zip/Archive/Zip/ZipItem.cpp | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CPP/7zip/Archive/Zip/ZipItem.cpp b/CPP/7zip/Archive/Zip/ZipItem.cpp
|
||
|
|
index 37b69933..353e8955 100644
|
||
|
|
--- a/CPP/7zip/Archive/Zip/ZipItem.cpp
|
||
|
|
+++ b/CPP/7zip/Archive/Zip/ZipItem.cpp
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
// Archive/ZipItem.cpp
|
||
|
|
|
||
|
|
-#if (!defined _WIN32) && (!defined __CYGWIN__)
|
||
|
|
+#if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__)
|
||
|
|
#include <iconv.h>
|
||
|
|
#include <locale.h>
|
||
|
|
#endif
|
||
|
|
@@ -355,7 +355,7 @@ void CItem::GetUnicodeString(UString &res, const AString &s, bool isComment, boo
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
- #if (!defined _WIN32) && (!defined __CYGWIN__)
|
||
|
|
+ #if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__)
|
||
|
|
// Convert OEM char set to UTF-8 if needed
|
||
|
|
// Use system locale to select code page
|
||
|
|
|