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/bitwriter.c | |
parent | 1294b6499609e377573d6a9d4841769cb5b2a10d (diff) | |
download | flac-5b62b770bc79d73138a59e74dc6db651cddc5f36.tar.gz |
Move all definitions of FLAC__U64L to one place.
Diffstat (limited to 'src/libFLAC/bitwriter.c')
-rw-r--r-- | src/libFLAC/bitwriter.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/libFLAC/bitwriter.c b/src/libFLAC/bitwriter.c index 1f005a3d..7d61d730 100644 --- a/src/libFLAC/bitwriter.c +++ b/src/libFLAC/bitwriter.c @@ -40,6 +40,7 @@ #include "private/macros.h" #include "FLAC/assert.h" #include "share/alloc.h" +#include "share/compat.h" #include "share/endswap.h" /* Things should be fastest when this matches the machine word size */ @@ -68,13 +69,6 @@ static const unsigned FLAC__BITWRITER_DEFAULT_INCREMENT = 4096u / sizeof(uint32_ #define FLAC__WORDS_TO_BITS(words) ((words) * FLAC__BITS_PER_WORD) #define FLAC__TOTAL_BITS(bw) (FLAC__WORDS_TO_BITS((bw)->words) + (bw)->bits) -/* 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 - struct FLAC__BitWriter { uint32_t *buffer; uint32_t accum; /* accumulator; bits are right-justified; when full, accum is appended to buffer */ |