diff options
| author | Cristian RodrÃguez <crrodriguez@opensuse.org> | 2012-04-05 19:39:37 -0300 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2012-04-06 09:52:06 +1000 |
| commit | f0296255918f6665fe9910874df2fd39ca039f30 (patch) | |
| tree | 531ab784dc77bb316b263fb0ca355db7cb8b6c5f /src/libFLAC/bitreader.c | |
| parent | d30fe60fc616d626df2336e91bc698677a732447 (diff) | |
| download | flac-f0296255918f6665fe9910874df2fd39ca039f30.tar.gz | |
V2: Use a single definition of MIN and MAX in sources
Diffstat (limited to 'src/libFLAC/bitreader.c')
| -rw-r--r-- | src/libFLAC/bitreader.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/libFLAC/bitreader.c b/src/libFLAC/bitreader.c index cd05a62b..7e17fd82 100644 --- a/src/libFLAC/bitreader.c +++ b/src/libFLAC/bitreader.c @@ -38,6 +38,7 @@ #include "private/bitmath.h" #include "private/bitreader.h" #include "private/crc.h" +#include "private/macros.h" #include "FLAC/assert.h" #include "share/endswap.h" @@ -109,15 +110,6 @@ static const unsigned char byte_to_unary_table[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -#ifdef min -#undef min -#endif -#define min(x,y) ((x)<(y)?(x):(y)) -#ifdef max -#undef max -#endif -#define max(x,y) ((x)>(y)?(x):(y)) - /* adjust for compilers that can't understand using LLU suffix for uint64_t literals */ #ifdef _MSC_VER #define FLAC__U64L(x) x @@ -547,7 +539,7 @@ FLAC__bool FLAC__bitreader_skip_bits_no_crc(FLAC__BitReader *br, unsigned bits) FLAC__uint32 x; if(n != 0) { - m = min(8-n, bits); + m = flac_min(8-n, bits); if(!FLAC__bitreader_read_raw_uint32(br, &x, m)) return false; bits -= m; |