diff options
| author | sezero <sezero@users.sourceforge.net> | 2019-08-05 02:00:40 +0300 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2019-08-05 12:35:08 +1000 |
| commit | 4a43f2bd4d7e12b5d994f48e18cf014008d204ce (patch) | |
| tree | b580edc7371238f8c0661329bdbc836c9e4e13f8 | |
| parent | 8dda876b231737331af683a620dbc4dbbeb0a21f (diff) | |
| download | flac-4a43f2bd4d7e12b5d994f48e18cf014008d204ce.tar.gz | |
Do not assume that sys/param.h defines MIN and MAX
One such example is sys/param.h from MinGW.
| -rw-r--r-- | src/libFLAC/include/private/macros.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libFLAC/include/private/macros.h b/src/libFLAC/include/private/macros.h index 02eada45..3a8072ec 100644 --- a/src/libFLAC/include/private/macros.h +++ b/src/libFLAC/include/private/macros.h @@ -51,8 +51,10 @@ /* Whatever other unix that has sys/param.h */ #elif defined(HAVE_SYS_PARAM_H) #include <sys/param.h> +#if defined(MIN) && defined(MAX) #define flac_max(a,b) MAX(a,b) #define flac_min(a,b) MIN(a,b) +#endif /* Windows VS has them in stdlib.h.. XXX:Untested */ #elif defined(_MSC_VER) |