diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2017-04-19 18:14:26 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2017-04-19 18:14:39 +1000 |
| commit | 64f47c2d71ffba5aa8cd1d2a447339fd95f362f9 (patch) | |
| tree | 9e23ae169c5f732975cd96fb85727c32915b490b | |
| parent | 59bedcf2287388f426812a6b809ec5f5c111b1e2 (diff) | |
| download | flac-64f47c2d71ffba5aa8cd1d2a447339fd95f362f9.tar.gz | |
libFLAC: Fix default flac_max/min
There were a number of specialized versions, but the default case
defined `MAX` and `MIN` instead of `flac_max` and `flac_min`.
| -rw-r--r-- | src/libFLAC/include/private/macros.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libFLAC/include/private/macros.h b/src/libFLAC/include/private/macros.h index becc59f9..02eada45 100644 --- a/src/libFLAC/include/private/macros.h +++ b/src/libFLAC/include/private/macros.h @@ -61,12 +61,12 @@ #define flac_min(a,b) __min(a,b) #endif -#ifndef MIN -#define MIN(x,y) ((x) <= (y) ? (x) : (y)) +#ifndef flac_min +#define flac_min(x,y) ((x) <= (y) ? (x) : (y)) #endif -#ifndef MAX -#define MAX(x,y) ((x) >= (y) ? (x) : (y)) +#ifndef flac_max +#define flac_max(x,y) ((x) >= (y) ? (x) : (y)) #endif #endif |