diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-08-21 12:05:11 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2012-08-22 09:59:49 +0200 |
| commit | 27c1445c9f82434a39ada4c5fbf188d1ab09e5ba (patch) | |
| tree | 594d1c024ab8fc9a595e4ec5f8625b9222672563 /src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp | |
| parent | b22a0e8e6d1b3114fc37acad7e96b6b3564a8e19 (diff) | |
Revert "Fixes required for errorless MinGW-w64 compilation are done."
This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it
breaks compressing the meta folder (Windows 7, VS 2010).
Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp')
| -rw-r--r-- | src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp b/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp index 3750f5b24..8ae2e15e8 100644 --- a/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp +++ b/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp @@ -275,8 +275,6 @@ static void AddNameToCensor(NWildcard::CCensor &wildcardCensor, case NRecursedType::kRecursed: recursed = true; break; - default: // PQR for MinGW-w64: To avoid compiler warnings on unhandled cases. - break; } wildcardCensor.AddItem(include, name, recursed); } @@ -744,8 +742,8 @@ static int FindCharset(const NCommandLineParser::CParser &parser, int keyIndex, UString name = parser[keyIndex].PostStrings.Back(); name.MakeUpper(); - unsigned int i; - for (i = 0; i < sizeof(g_CodePagePairs) / sizeof(g_CodePagePairs[0]); i++) // PQR for MinGW-w64: Signed < Unsigned. + int i; + for (i = 0; i < sizeof(g_CodePagePairs) / sizeof(g_CodePagePairs[0]); i++) { const CCodePagePair &pair = g_CodePagePairs[i]; if (name.Compare(pair.Name) == 0) |