From: Jim Meyering <jim@meyering.net>
Date: Sat, 24 Jun 1995 21:10:12 +0000 (+0000)
Subject: Undefine min and/or max before defining to avoid redefinition warning
X-Git-Tag: textutils-1_12_1~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86671a4ed09283236daad34900e55a9c7de1d57d;p=thirdparty%2Fcoreutils.git

Undefine min and/or max before defining to avoid redefinition warning
on systems.
---

diff --git a/src/cat.c b/src/cat.c
index de99b0dfd4..ca9d87ac89 100644
--- 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 1d27f75c59..e7d241d153 100644
--- 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 b17a2a75c0..c0d098b5f9 100644
--- 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 0d03ec832c..83f345ef87 100644
--- 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 5897c71660..8f86e978fb 100644
--- 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 ();