1 files changed, 5 insertions, 4 deletions
diff --git a/tests/test-intprops.c b/tests/test-intprops.c
index e0d63d47..3bffc3f5 100644
--- a/tests/test-intprops.c
+++ b/tests/test-intprops.c
@@ -16,9 +16,12 @@
 
 /* Written by Paul Eggert.  */
 
+#include <config.h>
+
+#if _GL_GNUC_PREREQ (4, 3)
+
 /* Tell gcc not to warn about the long expressions that the overflow
    macros expand to, or about the (X < 0) expressions.  */
-#if 4 < __GNUC__ + (3 <= __GNUC_MINOR__)
 # pragma GCC diagnostic ignored "-Woverlength-strings"
 # pragma GCC diagnostic ignored "-Wtype-limits"
 
@@ -28,8 +31,6 @@
 
 #endif
 
-#include <config.h>
-
 #ifdef TEST_STDCKDINT
 # include <stdckdint.h>
 #else
@@ -444,5 +445,5 @@ main (void)
   CHECK_REMAINDER (37*39u - 1, -39, true);
   CHECK_REMAINDER (LONG_MAX, -INT_MAX, false);
 
-  return 0;
+  return test_exit_status;
 }