Fix various compiler warnings contributed by Norman Princeton.

[simgear.git] / simgear / metar / Local.h

diff --git a/simgear/metar/Local.h b/simgear/metar/Local.h
index 47bec5de112fabcdd0d2fa724fbbabd69ee4f3e6..d0e26faeb3a3dbdca20716d373885b00ac0bf450 100644 (file)
--- a/simgear/metar/Local.h
+++ b/simgear/metar/Local.h
@@ -65,13 +65,17 @@
 #define IMOD(i, j)   (((i) % (j)) < 0 ? ((i) % (j))+(j) : ((i) % (j)))
 #define IN_RANGE(n, lo, hi) ((lo) <= (n) && (n) <= (hi))
 #define LOOPDN(r, n) for ((r) = (n)+1; --(r) > 0;)
-#define MAX(x, y)    (((x) < (y)) ? (y) : (x))
+#ifndef MAX
+#  define MAX(x, y)    (((x) < (y)) ? (y) : (x))
+#endif
 #ifndef max
-#define max(x, y)    (((x) < (y)) ? (y) : (x))
+#  define max(x, y)    (((x) < (y)) ? (y) : (x))
+#endif
+#ifndef MIN
+#  define MIN(x, y)    (((x) < (y)) ? (x) : (y))
 #endif
-#define MIN(x, y)    (((x) < (y)) ? (x) : (y))
 #ifndef min
-#define min(x, y)    (((x) < (y)) ? (x) : (y))
+#  define min(x, y)    (((x) < (y)) ? (x) : (y))
 #endif
 #define STREQ(s, t)  (strcmp(s, t) == 0)
 #define STRGT(s, t)  (strcmp(s, t) > 0)