From 2de567fb11ce3bbb711d993922d69af6d2cf817f Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sun, 7 Apr 2013 20:21:24 +1000 Subject: [PATCH] src/libFLAC/include/private/macros.h : Add default MIN/MAX macros. --- src/libFLAC/include/private/macros.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libFLAC/include/private/macros.h b/src/libFLAC/include/private/macros.h index 74e5e1a..162bcaf 100644 --- a/src/libFLAC/include/private/macros.h +++ b/src/libFLAC/include/private/macros.h @@ -61,6 +61,14 @@ #define flac_min(a,b) __min(a,b) #endif +#ifndef MIN +#define MIN(x,y) ((x) <= (y) ? (x) : (y)) +#endif + +#ifndef MAX +#define MAX(x,y) ((x) >= (y) ? (x) : (y)) +#endif + #if !defined(__cplusplus) && defined(_MSC_VER) #ifndef inline #define inline __inline -- 2.7.4