summaryrefslogtreecommitdiff
path: root/src/libFLAC
diff options
context:
space:
mode:
Diffstat (limited to 'src/libFLAC')
-rw-r--r--src/libFLAC/include/private/macros.h8
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