V2: Use a single definition of MIN and MAX in sources
diff --git a/src/libFLAC/fixed.c b/src/libFLAC/fixed.c
index 1a57cf4..05b289a 100644
--- a/src/libFLAC/fixed.c
+++ b/src/libFLAC/fixed.c
@@ -37,6 +37,7 @@
#include <string.h>
#include "private/bitmath.h"
#include "private/fixed.h"
+#include "private/macros.h"
#include "FLAC/assert.h"
#ifndef M_LN2
@@ -44,11 +45,6 @@
#define M_LN2 0.69314718055994530942
#endif
-#ifdef min
-#undef min
-#endif
-#define min(x,y) ((x) < (y)? (x) : (y))
-
#ifdef local_abs
#undef local_abs
#endif
@@ -242,11 +238,11 @@
error -= last_error_3; total_error_4 += local_abs(error); last_error_3 = save;
}
- if(total_error_0 < min(min(min(total_error_1, total_error_2), total_error_3), total_error_4))
+ if(total_error_0 < flac_min(flac_min(flac_min(total_error_1, total_error_2), total_error_3), total_error_4))
order = 0;
- else if(total_error_1 < min(min(total_error_2, total_error_3), total_error_4))
+ else if(total_error_1 < flac_min(flac_min(total_error_2, total_error_3), total_error_4))
order = 1;
- else if(total_error_2 < min(total_error_3, total_error_4))
+ else if(total_error_2 < flac_min(total_error_3, total_error_4))
order = 2;
else if(total_error_3 < total_error_4)
order = 3;
@@ -304,11 +300,11 @@
error -= last_error_3; total_error_4 += local_abs(error); last_error_3 = save;
}
- if(total_error_0 < min(min(min(total_error_1, total_error_2), total_error_3), total_error_4))
+ if(total_error_0 < flac_min(flac_min(flac_min(total_error_1, total_error_2), total_error_3), total_error_4))
order = 0;
- else if(total_error_1 < min(min(total_error_2, total_error_3), total_error_4))
+ else if(total_error_1 < flac_min(flac_min(total_error_2, total_error_3), total_error_4))
order = 1;
- else if(total_error_2 < min(total_error_3, total_error_4))
+ else if(total_error_2 < flac_min(total_error_3, total_error_4))
order = 2;
else if(total_error_3 < total_error_4)
order = 3;