From fc21768d440db6a7564e52d37fe489d6a8bca663 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sun, 21 Apr 2013 19:51:47 +1000 Subject: [PATCH] Fix compile when compiling with FLAC__INTEGER_ONLY_LIBRARY. Problem reported by Martijn van Beurden . --- src/libFLAC/include/private/bitmath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libFLAC/include/private/bitmath.h b/src/libFLAC/include/private/bitmath.h index 05daba1..42ce639 100644 --- a/src/libFLAC/include/private/bitmath.h +++ b/src/libFLAC/include/private/bitmath.h @@ -131,7 +131,7 @@ static inline unsigned FLAC__bitmath_ilog2_wide(FLAC__uint64 v) { if (v == 0) return 0; -#if && defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +#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.. */ #elif (defined(_MSC_VER) && (_MSC_VER >= 1400)) && (defined(_M_IA64) || defined(_WIN64)) -- 2.7.4