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/ogg_decoder_aspect.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/ogg_decoder_aspect.c')
| -rw-r--r-- | src/libFLAC/ogg_decoder_aspect.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libFLAC/ogg_decoder_aspect.c b/src/libFLAC/ogg_decoder_aspect.c index 0e8519c7..f67fb40e 100644 --- a/src/libFLAC/ogg_decoder_aspect.c +++ b/src/libFLAC/ogg_decoder_aspect.c @@ -37,11 +37,8 @@ #include "FLAC/assert.h" #include "private/ogg_decoder_aspect.h" #include "private/ogg_mapping.h" +#include "private/macros.h" -#ifdef max -#undef max -#endif -#define max(x,y) ((x)>(y)?(x):(y)) /*********************************************************************** * @@ -210,7 +207,7 @@ FLAC__OggDecoderAspectReadStatus FLAC__ogg_decoder_aspect_read_callback_wrapper( } else if (ret == 0) { /* need more data */ - const size_t ogg_bytes_to_read = max(bytes_requested - *bytes, OGG_BYTES_CHUNK); + const size_t ogg_bytes_to_read = flac_max(bytes_requested - *bytes, OGG_BYTES_CHUNK); char *oggbuf = ogg_sync_buffer(&aspect->sync_state, ogg_bytes_to_read); if(0 == oggbuf) { |