[no subject]

[Gavin D. Smith]

branch: master
commit 034617acb03540060c1a158ac2a9634c88712c02
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Jan 15 18:36:39 2023 +0000

    * system.h (MIN, MAX): Remove.
    * info/pcterm.h (MIN): Move MIN to here, the only use site.
---
 ChangeLog     |  5 +++++
 info/pcterm.c |  5 +++++
 system.h      | 11 -----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc8e37d7d4..309057b039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-01-15  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * system.h (MIN, MAX): Remove.
+       * info/pcterm.h (MIN): Move MIN to here, the only use site.
+
 2023-01-14  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/DocBook.pm (_new_document_context): Add the
diff --git a/info/pcterm.c b/info/pcterm.c
index b9d20b592a..21edbdc1bd 100644
--- a/info/pcterm.c
+++ b/info/pcterm.c
@@ -959,6 +959,11 @@ pc_up_line (void)
   ScreenSetCursor (MAX (y-1, 0), x);
 }
 
+#ifdef MIN
+#undef MIN
+#endif
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+
 /* Move the cursor down one line. */
 static void
 pc_down_line (void)
diff --git a/system.h b/system.h
index e32937f16e..db351e8427 100644
--- a/system.h
+++ b/system.h
@@ -192,17 +192,6 @@ extern void xexit (int);
 #define STRCASEEQ(s1,s2) (strcasecmp (s1, s2) == 0)
 #define STRNCASEEQ(s1,s2,n) (strncasecmp (s1, s2, n) == 0)
 
-/* We don't need anything fancy.  If we did need something fancy, gnulib
-   has it.  */
-#ifdef MIN
-#undef MIN
-#endif
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#ifdef MAX
-#undef MAX
-#endif
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
 #ifndef TEXINFO_PRINTFLIKE
 # ifdef __GNUC__
 #  define TEXINFO_PRINTFLIKE(fmt,narg) __attribute__ ((__format__ (__printf__, 
fmt, narg)))