Undefine min and/or max before defining to avoid redefinition warning

on systems.

diff --git a/src/cat.c b/src/cat.c
index de99b0dfd48b188d587376adb940c28594ade3f8..ca9d87ac89570805779069ff02a83e698d6c1c78 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -34,6 +34,8 @@
 #include "version.h"
 #include "error.h"
 
+/* Undefine, to avoid warning about redefinition on some systems.  */
+#undef max
 #define max(h,i) ((h) > (i) ? (h) : (i))
 
 char *stpcpy ();

diff --git a/src/comm.c b/src/comm.c
index 1d27f75c594ab5a47602398dfa4219a109678f6a..e7d241d153a3b4bc5a61792d4fc0f391ce873212 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -27,6 +27,8 @@
 #include "version.h"
 #include "error.h"
 
+/* Undefine, to avoid warning about redefinition on some systems.  */
+#undef min
 #define min(x, y) ((x) < (y) ? (x) : (y))
 
 /* The name this program was run with. */

diff --git a/src/join.c b/src/join.c
index b17a2a75c09f3d19dee8e12ae37f1c2244d720dc..c0d098b5f9f1f8ae1860bcbf61e5351c95f3cae0 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -36,6 +36,9 @@ char *xmalloc ();
 char *xrealloc ();
 static void usage ();
 
+/* Undefine, to avoid warning about redefinition on some systems.  */
+#undef min
+#undef max
 #define min(A, B) ((A) < (B) ? (A) : (B))
 #define max(A, B) ((A) > (B) ? (A) : (B))
 

diff --git a/src/sort.c b/src/sort.c
index 0d03ec832c82147660c430b0a4041df1c27b6f4b..83f345ef877b3220ee9b1ee59a03707e00658fbb 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -47,7 +47,10 @@ void free ();
 
 static void usage ();
 
+/* Undefine, to avoid warning about redefinition on some systems.  */
+#undef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
+
 #define UCHAR_LIM (UCHAR_MAX + 1)
 #define UCHAR(c) ((unsigned char) (c))
 

diff --git a/src/uniq.c b/src/uniq.c
index 5897c71660933c84a9c69d592d3dad17da362756..8f86e978fbf8dacb26f3c9a3ebb46555df348bbd 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -30,6 +30,8 @@
 #include "version.h"
 #include "error.h"
 
+/* Undefine, to avoid warning about redefinition on some systems.  */
+#undef min
 #define min(x, y) ((x) < (y) ? (x) : (y))
 
 static char *find_field ();