diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2017-01-15 12:20:52 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2017-01-15 12:20:52 +1100 |
| commit | 8967db0cb0fa3dcac00c12b056a7af1a58a3efa8 (patch) | |
| tree | 6a34e22a0ef9494e9a4017b05e461643d0986260 /src/libFLAC/include/private | |
| parent | 71b909b7a48bd112b7c05ae5dead92b3fc6e585a (diff) | |
| download | flac-8967db0cb0fa3dcac00c12b056a7af1a58a3efa8.tar.gz | |
bitmath.h: More unsigned fixes
Diffstat (limited to 'src/libFLAC/include/private')
| -rw-r--r-- | src/libFLAC/include/private/bitmath.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libFLAC/include/private/bitmath.h b/src/libFLAC/include/private/bitmath.h index 0d0a9c8a..d9117b63 100644 --- a/src/libFLAC/include/private/bitmath.h +++ b/src/libFLAC/include/private/bitmath.h @@ -82,7 +82,7 @@ static inline uint32_t FLAC__clz_uint32(FLAC__uint32 v) return __builtin_clz(v); #elif defined(_MSC_VER) { - uint32_t long idx; + uint64_t idx; _BitScanReverse(&idx, v); return idx ^ 31U; } @@ -106,7 +106,7 @@ static inline uint32_t FLAC__clz_uint64(FLAC__uint64 v) return __builtin_clzll(v); #elif (defined(__INTEL_COMPILER) || defined(_MSC_VER)) && (defined(_M_IA64) || defined(_M_X64)) { - uint32_t long idx; + uint64_t idx; _BitScanReverse64(&idx, v); return idx ^ 63U; } @@ -160,7 +160,7 @@ static inline uint32_t FLAC__bitmath_ilog2(FLAC__uint32 v) return _bit_scan_reverse(v); #elif defined(_MSC_VER) { - uint32_t long idx; + uint64_t idx; _BitScanReverse(&idx, v); return idx; } @@ -177,7 +177,7 @@ static inline uint32_t FLAC__bitmath_ilog2_wide(FLAC__uint64 v) /* Sorry, only supported in x64/Itanium.. and both have fast FPU which makes integer-only encoder pointless */ #elif (defined(__INTEL_COMPILER) || defined(_MSC_VER)) && (defined(_M_IA64) || defined(_M_X64)) { - uint32_t long idx; + uint64_t idx; _BitScanReverse64(&idx, v); return idx; } |