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/Archive/Common | |
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/Archive/Common')
-rw-r--r-- | src/libs/7zip/win/CPP/7zip/Archive/Common/HandlerOut.cpp | 4 | ||||
-rw-r--r-- | src/libs/7zip/win/CPP/7zip/Archive/Common/ParseProperties.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/Archive/Common/HandlerOut.cpp b/src/libs/7zip/win/CPP/7zip/Archive/Common/HandlerOut.cpp index ed5aea150..70ad47aad 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/Common/HandlerOut.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/Common/HandlerOut.cpp @@ -161,7 +161,7 @@ static bool ConvertProperty(PROPVARIANT srcProp, VARTYPE varType, NCOM::CPropVar static int FindPropIdExact(const UString &name) { - for (unsigned int i = 0; i < sizeof(g_NameToPropID) / sizeof(g_NameToPropID[0]); i++) // PQR for MinGW-w64: Signed < Unsigned comparison. + for (int i = 0; i < sizeof(g_NameToPropID) / sizeof(g_NameToPropID[0]); i++) if (name.CompareNoCase(g_NameToPropID[i].Name) == 0) return i; return -1; @@ -169,7 +169,7 @@ static int FindPropIdExact(const UString &name) static int FindPropIdStart(const UString &name) { - for (unsigned int i = 0; i < sizeof(g_NameToPropID) / sizeof(g_NameToPropID[0]); i++) // PQR for MinGW-w64: Signed < Unsigned comparison. + for (int i = 0; i < sizeof(g_NameToPropID) / sizeof(g_NameToPropID[0]); i++) { UString t = g_NameToPropID[i].Name; if (t.CompareNoCase(name.Left(t.Length())) == 0) diff --git a/src/libs/7zip/win/CPP/7zip/Archive/Common/ParseProperties.cpp b/src/libs/7zip/win/CPP/7zip/Archive/Common/ParseProperties.cpp index 5ce58d5ed..5cd849e29 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/Common/ParseProperties.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/Common/ParseProperties.cpp @@ -50,7 +50,7 @@ HRESULT ParsePropDictionaryValue(const UString &srcStringSpec, UInt32 &dicSize) return E_INVALIDARG; if (srcString.Length() == numDigits) { - if (number >= (unsigned int)kLogarithmicSizeLimit) // PQR for MinGW-w64: Signed < Unsigned comparison. + if (number >= kLogarithmicSizeLimit) return E_INVALIDARG; dicSize = (UInt32)1 << (int)number; return S_OK; |