From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 3 Oct 2021 01:07:27 +0000 (-0700)
Subject: ls: port to OpenBSD
X-Git-Tag: v9.1~207
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cfd48481da0486e2bad193495bc38e7d5ead7e4;p=thirdparty%2Fcoreutils.git

ls: port to OpenBSD

Problem reported by Brian Callahan (Bug#50972).
* src/ls.c (decode_switches): Don’t assume __GNUC_PREREQ.
---

diff --git a/src/ls.c b/src/ls.c
index 1047801e84..322affef4a 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -2273,7 +2273,7 @@ decode_switches (int argc, char **argv)
       if (linelen < 0)
         {
           /* Suppress bogus warning re comparing ws.ws_col to big integer.  */
-# if __GNUC_PREREQ (4, 6)
+# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wtype-limits"
 # endif
@@ -2282,7 +2282,7 @@ decode_switches (int argc, char **argv)
               && 0 <= ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws)
               && 0 < ws.ws_col)
             linelen = ws.ws_col <= MIN (PTRDIFF_MAX, SIZE_MAX) ? ws.ws_col : 0;
-# if __GNUC_PREREQ (4, 6)
+# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
 #  pragma GCC diagnostic pop
 # endif
         }