From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 1 Nov 2021 05:30:38 +0000 (-0700)
Subject: maint: use minmax.h instead of rolling our own
X-Git-Tag: v9.1~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea024067488e4ed7eb0038af8059b2d7ab16f1ff;p=thirdparty%2Fcoreutils.git

maint: use minmax.h instead of rolling our own

* gl/lib/mbsalign.c, gl/lib/randread.c, src/system.h (MAX, MIN):
Remove; include minmax.h instead.
* gl/modules/mbsalign, gl/modules/randread (Depends-on): Add minmax.
* src/factor.c (MIN): Remove.
---

diff --git a/gl/lib/mbsalign.c b/gl/lib/mbsalign.c
index 74e28ca1b6..0ef9f8d129 100644
--- a/gl/lib/mbsalign.c
+++ b/gl/lib/mbsalign.c
@@ -19,6 +19,8 @@
 #include <config.h>
 #include "mbsalign.h"
 
+#include "minmax.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -28,10 +30,6 @@
 #include <wchar.h>
 #include <wctype.h>
 
-#ifndef MIN
-# define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
 /* Replace non printable chars.
    Note \t and \n etc. are non printable.
    Return 1 if replacement made, 0 otherwise.  */
diff --git a/gl/lib/randread.c b/gl/lib/randread.c
index d8c5cbaf5c..6949783e1f 100644
--- a/gl/lib/randread.c
+++ b/gl/lib/randread.c
@@ -40,15 +40,12 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
+#include "minmax.h"
 #include "rand-isaac.h"
 #include "stdio-safer.h"
 #include "unlocked-io.h"
 #include "xalloc.h"
 
-#ifndef MIN
-# define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
 #if _STRING_ARCH_unaligned || _STRING_INLINE_unaligned
 # define ALIGNED_POINTER(ptr, type) true
 #else
diff --git a/gl/modules/mbsalign b/gl/modules/mbsalign
index 7f9c9741bb..c27c21225a 100644
--- a/gl/modules/mbsalign
+++ b/gl/modules/mbsalign
@@ -6,6 +6,7 @@ lib/mbsalign.c
 lib/mbsalign.h
 
 Depends-on:
+minmax
 wchar
 wctype
 wcwidth
diff --git a/gl/modules/randread b/gl/modules/randread
index 5c68240387..cba84db354 100644
--- a/gl/modules/randread
+++ b/gl/modules/randread
@@ -14,6 +14,7 @@ inline
 fopen-safer
 getrandom
 quote
+minmax
 stdalign
 stdbool
 stdint
diff --git a/src/factor.c b/src/factor.c
index 6586ec7571..614f8fa15c 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -1950,7 +1950,6 @@ static const unsigned short invtab[0x81] =
 # define Q_FREQ_SIZE 50
 /* Element 0 keeps the total */
 static unsigned int q_freq[Q_FREQ_SIZE + 1];
-# define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
 #if USE_SQUFOF
diff --git a/src/system.h b/src/system.h
index ce07ab03fc..bc51e03590 100644
--- a/src/system.h
+++ b/src/system.h
@@ -380,14 +380,7 @@ enum
     exit (EXIT_SUCCESS);						\
     break;
 
-#ifndef MAX
-# define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef MIN
-# define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
+#include "minmax.h"
 #include "intprops.h"
 
 #ifndef SSIZE_MAX