Fix remaining tests of __GNUC_MINOR__ to use __GNUC_PREREQ instead

Author: th-otto

argp/argp-fmtstream.h

@@ -31,12 +31,12 @@
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if !__GNUC_PREREQ(2,5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__
+# if !__GNUC_PREREQ(2,7) || __STRICT_ANSI__
 #  define __format__ format
 #  define __printf__ printf
 # endif

include/argp.h

@@ -42,12 +42,12 @@
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if !__GNUC_PREREQ(2,5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__
+# if !__GNUC_PREREQ(2,7) || __STRICT_ANSI__
 #  define __format__ format
 #  define __printf__ printf
 # endif
@@ -56,7 +56,7 @@
 /* GCC 2.95 and later have "__restrict"; C99 compilers have
    "restrict", and "configure" may have defined "restrict".  */
 #ifndef __restrict
-# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
+# if !__GNUC_PREREQ(2,95)
 #  if defined restrict || 199901L <= __STDC_VERSION__
 #   define __restrict restrict
 #  else

include/assert.h

@@ -96,8 +96,7 @@ __END_DECLS
 /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
    which contains the name of the function currently being defined.
    This is broken in G++ before version 2.6.  */
-# if (!defined __GNUC__ || __GNUC__ < 2 || \
-     (__GNUC__ == 2 && __GNUC_MINOR__ < (defined __cplusplus ? 6 : 4)))
+# if (!(defined(__cplusplus) ? __GNUC_PREREQ(2,6) : __GNUC_PREREQ(2,4)))
 #  define __ASSERT_FUNCTION	((const char *) 0)
 # else
 #  define __ASSERT_FUNCTION	__PRETTY_FUNCTION__

include/error.h

@@ -23,12 +23,12 @@
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if !__GNUC_PREREQ(2,5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# if !__GNUC_PREREQ(2,7) || __STRICT_ANSI__
 #  define __format__ format
 #  define __printf__ printf
 # endif

include/obstack.h

@@ -346,7 +346,7 @@ extern int obstack_exit_failure;
 /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
    does not implement __extension__.  But that compiler doesn't define
    __GNUC_MINOR__.  */
-# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
+# if !__GNUC_PREREQ(2,0)
 #  define __extension__
 # endif
 

include/sys/types.h

@@ -131,7 +131,7 @@ typedef unsigned int uint;
 
 /* These size-specific names are used by some of the inet code.  */
 
-#if !defined __GNUC__ || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#if !__GNUC_PREREQ(2,7)
 
 /* These types are defined by the ISO C 9x header <inttypes.h>. */
 # ifndef __int8_t_defined

mintlib/libc-symbols.h

@@ -175,7 +175,7 @@
 
 /* Currently disabled since not supported by gcc for MiNT.  FIXME!!! */
 #if (0 && !defined __ASSEMBLER__ && \
-     (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)))
+     (__GNUC_PREREQ(2,7)))
 /* GCC 2.7 and later has special syntax for weak symbols and aliases.
    Using that is better when possible, because the compiler and assembler
    are better clued in to what we are doing.  */

stdlib/longlong.h

@@ -656,7 +656,7 @@ extern USItype __udiv_qrnnd ();
 #endif /* __m88000__ */
 
 #if defined (__mips__) && W_TYPE_SIZE == 32
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+#if __GNUC_PREREQ(2,7)
 #define umul_ppmm(w1, w0, u, v) \
   __asm__ ("multu %2,%3"						\
 	   : "=l" ((USItype)(w0)),					\
@@ -678,7 +678,7 @@ extern USItype __udiv_qrnnd ();
 #endif /* __mips__ */
 
 #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+#if __GNUC_PREREQ(2,7)
 #define umul_ppmm(w1, w0, u, v) \
   __asm__ ("dmultu %2,%3"						\
 	   : "=l" ((UDItype)(w0)),					\

stdlib/strtol.c

@@ -130,7 +130,7 @@
 # define STRTOL_LONG_MIN LONG_LONG_MIN
 # define STRTOL_LONG_MAX LONG_LONG_MAX
 # define STRTOL_ULONG_MAX ULONG_LONG_MAX
-# if __GNUC__ == 2 && __GNUC_MINOR__ < 7
+# if defined(__GNUC__) && !__GNUC_PREREQ(2,7)
    /* Work around gcc bug with using this constant.  */
    static const unsigned long long int maxquad = ULONG_LONG_MAX;
 #  undef STRTOL_ULONG_MAX