diff options
Diffstat (limited to 'CPP/7zip/Archive/Nsis')
| -rwxr-xr-x | CPP/7zip/Archive/Nsis/NsisHandler.h | 3 | ||||
| -rwxr-xr-x | CPP/7zip/Archive/Nsis/NsisIn.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CPP/7zip/Archive/Nsis/NsisHandler.h b/CPP/7zip/Archive/Nsis/NsisHandler.h index e57cbad8..e180f70d 100755 --- a/CPP/7zip/Archive/Nsis/NsisHandler.h +++ b/CPP/7zip/Archive/Nsis/NsisHandler.h @@ -27,8 +27,7 @@ class CHandler: bool GetCompressedSize(int index, UInt32 &size); public: - MY_QUERYINTERFACE_BEGIN - MY_QUERYINTERFACE_ENTRY(IInArchive) + MY_QUERYINTERFACE_BEGIN2(IInArchive) QUERY_ENTRY_ISetCompressCodecsInfo MY_QUERYINTERFACE_END MY_ADDREF_RELEASE diff --git a/CPP/7zip/Archive/Nsis/NsisIn.cpp b/CPP/7zip/Archive/Nsis/NsisIn.cpp index f14bf47c..8797a8e7 100755 --- a/CPP/7zip/Archive/Nsis/NsisIn.cpp +++ b/CPP/7zip/Archive/Nsis/NsisIn.cpp @@ -23,7 +23,9 @@ public: SignatureInitializer() { kSignature[0]--; }; } g_SignatureInitializer; +#ifdef NSIS_SCRIPT static const char *kCrLf = "\x0D\x0A"; +#endif UInt32 GetUInt32FromMemLE(const Byte *p) { @@ -245,6 +247,7 @@ enum EW_LOCKWINDOW }; +#ifdef NSIS_SCRIPT static CCommandPair kCommandPairs[] = { { 0, "Invalid" }, @@ -324,6 +327,7 @@ static CCommandPair kCommandPairs[] = { 6, "LockWindow" } }; +#endif static const char *kShellStrings[] = { |