summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/lib7z
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-04-30 06:44:14 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-04-30 06:44:14 +0000
commite8829d3ac95576571e6217edbbc8143fe30aaaa4 (patch)
treefd9549a3337b7f955fd908fdf89733a0c9997683 /src/lib/lib7z
parent0098f14e668ddf01495f7e86cc3e633305f9e95e (diff)
Sync with MAME, various fixes from Firewave and RB (no whatsnew)
Diffstat (limited to 'src/lib/lib7z')
-rw-r--r--src/lib/lib7z/CpuArch.h2
-rw-r--r--src/lib/lib7z/LzmaEnc.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/lib7z/CpuArch.h b/src/lib/lib7z/CpuArch.h
index f424502f473..4d81efda418 100644
--- a/src/lib/lib7z/CpuArch.h
+++ b/src/lib/lib7z/CpuArch.h
@@ -97,7 +97,7 @@ Stop_Compiling_Bad_Endian
#endif
-#if defined(MY_CPU_LE_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300)
+#if defined(MY_CPU_LE_UNALIGN) && defined(_WIN64) && (defined(_MSC_VER) && (_MSC_VER >= 1300))
#include <stdlib.h>
#pragma intrinsic(_byteswap_ulong)
diff --git a/src/lib/lib7z/LzmaEnc.c b/src/lib/lib7z/LzmaEnc.c
index 17d63f38cd2..b644547ddc4 100644
--- a/src/lib/lib7z/LzmaEnc.c
+++ b/src/lib/lib7z/LzmaEnc.c
@@ -1905,11 +1905,13 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
{
UInt32 beforeSize = kNumOpts;
+ #ifndef _7ZIP_ST
Bool btMode;
+ #endif
if (!RangeEnc_Alloc(&p->rc, alloc))
return SZ_ERROR_MEM;
- btMode = (p->matchFinderBase.btMode != 0);
#ifndef _7ZIP_ST
+ btMode = (p->matchFinderBase.btMode != 0);
p->mtMode = (p->multiThread && !p->fastMode && btMode);
#endif