diff options
Diffstat (limited to 'CPP/7zip/Archive/7z/7zHandler.cpp')
| -rwxr-xr-x | CPP/7zip/Archive/7z/7zHandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CPP/7zip/Archive/7z/7zHandler.cpp b/CPP/7zip/Archive/7z/7zHandler.cpp index abccdce9..dc0a6505 100755 --- a/CPP/7zip/Archive/7z/7zHandler.cpp +++ b/CPP/7zip/Archive/7z/7zHandler.cpp @@ -143,10 +143,12 @@ static inline UString GetHex2(Byte value) static const UInt64 k_AES = 0x06F10701; +#ifndef _SFX static inline UInt32 GetUInt32FromMemLE(const Byte *p) { return p[0] | (((UInt32)p[1]) << 8) | (((UInt32)p[2]) << 16) | (((UInt32)p[3]) << 24); } +#endif bool CHandler::IsEncrypted(UInt32 index2) const { @@ -393,11 +395,11 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *va COM_TRY_END } +#ifdef _7Z_VOL + static const wchar_t *kExt = L"7z"; static const wchar_t *kAfterPart = L".7z"; -#ifdef _7Z_VOL - class CVolumeName { bool _first; |