From 3a524e5ba2d7bb0c46e11502822f8093dd2ab0f4 Mon Sep 17 00:00:00 2001 From: Igor Pavlov Date: Wed, 31 Dec 2008 00:00:00 +0000 Subject: 4.63 --- CPP/7zip/Archive/Zip/ZipAddCommon.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'CPP/7zip/Archive/Zip/ZipAddCommon.h') diff --git a/CPP/7zip/Archive/Zip/ZipAddCommon.h b/CPP/7zip/Archive/Zip/ZipAddCommon.h index 6c766037..8f5b568d 100755 --- a/CPP/7zip/Archive/Zip/ZipAddCommon.h +++ b/CPP/7zip/Archive/Zip/ZipAddCommon.h @@ -1,16 +1,18 @@ -// Zip/AddCommon.h +// ZipAddCommon.h -#ifndef __ZIP_ADDCOMMON_H -#define __ZIP_ADDCOMMON_H +#ifndef __ZIP_ADD_COMMON_H +#define __ZIP_ADD_COMMON_H #include "../../ICoder.h" #include "../../IProgress.h" -#include "../../Compress/Copy/CopyCoder.h" #include "../../Common/CreateCoder.h" #include "../../Common/FilterCoder.h" -#include "../../Crypto/Zip/ZipCipher.h" -#include "../../Crypto/WzAES/WzAES.h" + +#include "../../Compress/CopyCoder.h" + +#include "../../Crypto/ZipCrypto.h" +#include "../../Crypto/WzAes.h" #include "ZipCompressionMode.h" @@ -38,7 +40,7 @@ class CAddCommon CMyComPtr _cryptoStream; NCrypto::NZip::CEncoder *_filterSpec; - NCrypto::NWzAES::CEncoder *_filterAesSpec; + NCrypto::NWzAes::CEncoder *_filterAesSpec; CMyComPtr _zipCryptoFilter; CMyComPtr _aesFilter; -- cgit v1.2.3