diff options
| author | tjenssen <tim.jenssen@nokia.com> | 2012-08-08 17:31:38 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-08-10 13:12:47 +0200 |
| commit | 9cad5d54cf0d78e92b4ee831299d83b657f42f2e (patch) | |
| tree | e1914be8eadfd06ad64ff5dd31d200a4cf95df86 /src/libs/7zip/win/CPP/7zip/Archive/Zip | |
| parent | 0188b08e8dc218fb66f59522ffa7c02643a9577a (diff) | |
Fixes required for errorless MinGW-w64 compilation are done.
Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/7zip/win/CPP/7zip/Archive/Zip')
| -rw-r--r-- | src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp | 2 | ||||
| -rw-r--r-- | src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp | 2 | ||||
| -rw-r--r-- | src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp index bd1563226..06ae08644 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp @@ -265,7 +265,7 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *val bool finded = false; if (item.CentralExtra.GetStrongCryptoField(f)) { - for (int i = 0; i < sizeof(g_StrongCryptoPairs) / sizeof(g_StrongCryptoPairs[0]); i++) + for (unsigned int i = 0; i < sizeof(g_StrongCryptoPairs) / sizeof(g_StrongCryptoPairs[0]); i++) // PQR for MinGW-w64: Signed < Unsigned comparison. { const CStrongCryptoPair &pair = g_StrongCryptoPairs[i]; if (f.AlgId == pair.Id) diff --git a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp index a5e0f59d7..a8ce40962 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp @@ -263,7 +263,7 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt return E_INVALIDARG; if (options.IsAesMode) { - if (options.Password.Length() > NCrypto::NWzAes::kPasswordSizeMax) + if (options.Password.Length() > (int)NCrypto::NWzAes::kPasswordSizeMax) // PQR for MinGW-w64: Signed < Unsigned comparison. return E_INVALIDARG; } options.Password = UnicodeStringToMultiByte((const wchar_t *)password, CP_OEMCP); diff --git a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp index b36b61be7..792a244be 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp @@ -521,7 +521,7 @@ HRESULT CInArchive::FindCd(CCdInfo &cdInfo) { if (Get32(buf + i) == NSignature::kEndOfCentralDir) { - if (i >= kZip64EcdLocatorSize) + if (i >= (int)kZip64EcdLocatorSize) // PQR for MinGW-w64: Signed < Unsigned comparison. { const Byte *locator = buf + i - kZip64EcdLocatorSize; if (Get32(locator) == NSignature::kZip64EndOfCentralDirLocator) |