From 1a6df831633d701dce69fa01472a8be195c4132e Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Fri, 11 Apr 2014 06:16:32 +1000 Subject: [PATCH] Use _M_X64 instead of _WIN64. Patch-from: lvqcl --- src/libFLAC/include/private/bitmath.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libFLAC/include/private/bitmath.h b/src/libFLAC/include/private/bitmath.h index ba9b76e0..fd65cca5 100644 --- a/src/libFLAC/include/private/bitmath.h +++ b/src/libFLAC/include/private/bitmath.h @@ -142,8 +142,8 @@ static inline unsigned FLAC__bitmath_ilog2_wide(FLAC__uint64 v) return 0; #if defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) return sizeof(FLAC__uint64) * CHAR_BIT - 1 - __builtin_clzll(v); -/* Sorry, only supported in win64/Itanium.. and both have fast FPU which makes integer-only encoder pointless */ -#elif (defined(_MSC_VER) && (_MSC_VER >= 1400)) && (defined(_M_IA64) || defined(_WIN64)) +/* Sorry, only supported in x64/Itanium.. and both have fast FPU which makes integer-only encoder pointless */ +#elif (defined(_MSC_VER) && (_MSC_VER >= 1400)) && (defined(_M_IA64) || defined(_M_X64)) { unsigned long idx; _BitScanReverse64(&idx, v);