summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2013-04-07 20:21:24 +1000
committerErik de Castro Lopo <erikd@mega-nerd.com>2013-04-07 20:21:24 +1000
commit2de567fb11ce3bbb711d993922d69af6d2cf817f (patch)
tree06620c999483261f81588117b661349f2eead737
parent03a9e6064d406e3656afacdbe50e8e47ebfa0de3 (diff)
downloadflac-2de567fb11ce3bbb711d993922d69af6d2cf817f.tar.gz
src/libFLAC/include/private/macros.h : Add default MIN/MAX macros.
-rw-r--r--src/libFLAC/include/private/macros.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libFLAC/include/private/macros.h b/src/libFLAC/include/private/macros.h
index 74e5e1a2..162bcafe 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