diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2012-06-22 14:52:53 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2012-06-22 14:52:53 +1000 |
| commit | 5b62b770bc79d73138a59e74dc6db651cddc5f36 (patch) | |
| tree | bb875235695ab17494ae5d6f3c0b0e3f57ce8d14 /src/libFLAC/float.c | |
| parent | 1294b6499609e377573d6a9d4841769cb5b2a10d (diff) | |
| download | flac-5b62b770bc79d73138a59e74dc6db651cddc5f36.tar.gz | |
Move all definitions of FLAC__U64L to one place.
Diffstat (limited to 'src/libFLAC/float.c')
| -rw-r--r-- | src/libFLAC/float.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/libFLAC/float.c b/src/libFLAC/float.c index 1713126f..d411e4ed 100644 --- a/src/libFLAC/float.c +++ b/src/libFLAC/float.c @@ -34,18 +34,11 @@ #endif #include "FLAC/assert.h" - +#include "share/compat.h" #include "private/float.h" #ifdef FLAC__INTEGER_ONLY_LIBRARY -/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */ -#ifdef _MSC_VER -#define FLAC__U64L(x) x -#else -#define FLAC__U64L(x) x##LLU -#endif - const FLAC__fixedpoint FLAC__FP_ZERO = 0; const FLAC__fixedpoint FLAC__FP_ONE_HALF = 0x00008000; const FLAC__fixedpoint FLAC__FP_ONE = 0x00010000; @@ -282,7 +275,7 @@ FLAC__uint32 FLAC__fixedpoint_log2(FLAC__uint32 x, unsigned fracbits, unsigned p if(x < ONE) return 0; - + if(precision > LOG2_LOOKUP_PRECISION) precision = LOG2_LOOKUP_PRECISION; |