From 04c24872f01f4a60394e29f1a7976a138446cae3 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Fri, 21 Sep 2012 17:08:06 +0000 Subject: [PATCH] lib7z: fix portability problems that resulted in memory trashing in some configurations. [R. Belmont] --- src/lib/lib7z/7zCrc.c | 5 +---- src/lib/lib7z/CpuArch.h | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lib/lib7z/7zCrc.c b/src/lib/lib7z/7zCrc.c index d82bc7ec5af..1b948de0ec8 100644 --- a/src/lib/lib7z/7zCrc.c +++ b/src/lib/lib7z/7zCrc.c @@ -6,10 +6,7 @@ #define kCrcPoly 0xEDB88320 -#ifdef MY_CPU_X86_OR_AMD64 - #define CRC_NUM_TABLES 8 - UInt32 MY_FAST_CALL CrcUpdateT8(UInt32 v, const void *data, size_t size, const UInt32 *table); -#elif defined(MY_CPU_LE) +#if defined(MY_CPU_LE) #define CRC_NUM_TABLES 4 #else #define CRC_NUM_TABLES 5 diff --git a/src/lib/lib7z/CpuArch.h b/src/lib/lib7z/CpuArch.h index 4d81efda418..50a7467f639 100644 --- a/src/lib/lib7z/CpuArch.h +++ b/src/lib/lib7z/CpuArch.h @@ -20,7 +20,7 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of pla #define MY_CPU_AMD64 #endif -#if defined(MY_CPU_AMD64) || defined(_M_IA64) +#ifdef PTR64 #define MY_CPU_64BIT #endif @@ -52,7 +52,7 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of pla #define MY_CPU_LE #endif -#if defined(__BIG_ENDIAN__) || defined(__m68k__) || defined(__ARMEB__) || defined(__MIPSEB__) +#ifdef BIGENDIAN #define MY_CPU_BE #endif