diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-04-21 19:51:47 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-04-21 19:51:56 +1000 |
| commit | fc21768d440db6a7564e52d37fe489d6a8bca663 (patch) | |
| tree | 3f9dacfb28193e304b2dcd727b53dd89f606c59a | |
| parent | ef40d9d4cabb78dbb3d909c389c677c448b212af (diff) | |
| download | flac-fc21768d440db6a7564e52d37fe489d6a8bca663.tar.gz | |
Fix compile when compiling with FLAC__INTEGER_ONLY_LIBRARY.
Problem reported by Martijn van Beurden <mvanb1@gmail.com>.
| -rw-r--r-- | src/libFLAC/include/private/bitmath.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libFLAC/include/private/bitmath.h b/src/libFLAC/include/private/bitmath.h index 05daba1e..42ce6390 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)) |