summaryrefslogtreecommitdiff
path: root/tests/test-stdbool.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-01-08 11:53:52 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-01-08 11:53:52 +0100
commitfa838e76139763f902c7d27cb9e1d393ed6a15e4 (patch)
tree7d0ae09775ea950056193eaa2ca93844299d46f1 /tests/test-stdbool.c
parentc78359d9542c86b972aac373efcf7bc7a8a560e5 (diff)
parent2959e59fab3bab834368adefd90bd4b1b094366b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/test-stdbool.c')
-rw-r--r--tests/test-stdbool.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/tests/test-stdbool.c b/tests/test-stdbool.c
index 6b775bf8..ecc3c66a 100644
--- a/tests/test-stdbool.c
+++ b/tests/test-stdbool.c
@@ -1,5 +1,5 @@
/* Test of <stdbool.h> substitute.
- Copyright (C) 2002-2007, 2009-2018 Free Software Foundation, Inc.
+ Copyright (C) 2002-2007, 2009-2022 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,14 +16,18 @@
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
-/* We want this test to succeed even when using gcc's -Werror; but to
- do that requires a pragma that didn't exist before 4.3.0. */
-#ifndef __GNUC__
+/* Define ADDRESS_CHECK_OKAY if it is OK to assign an address to a 'bool'
+ and this does not generate a warning (because we want this test to succeed
+ even when using gcc's -Werror). */
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) \
+ || (__clang_major__ >= 4)
+/* We can silence the warning. */
+# pragma GCC diagnostic ignored "-Waddress"
# define ADDRESS_CHECK_OKAY
-#elif __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
-/* No way to silence -Waddress. */
+#elif defined __GNUC__ || defined __clang__
+/* There may be a warning. */
#else
-# pragma GCC diagnostic ignored "-Waddress"
+/* Ignore warnings from other compilers. */
# define ADDRESS_CHECK_OKAY
#endif
@@ -52,20 +56,20 @@
/* Several tests cannot be guaranteed with gnulib's <stdbool.h>, at
least, not for all compilers and compiler options. */
-#if HAVE_STDBOOL_H || 3 <= __GNUC__
+#if HAVE_STDBOOL_H || 3 <= __GNUC__ || 4 <= __clang_major__
struct s { _Bool s: 1; _Bool t; } s;
#endif
char a[true == 1 ? 1 : -1];
char b[false == 0 ? 1 : -1];
char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-#if HAVE_STDBOOL_H || 3 <= __GNUC__ /* See above. */
+#if HAVE_STDBOOL_H || 3 <= __GNUC__ || 4 <= __clang_major__ /* See above. */
char d[(bool) 0.5 == true ? 1 : -1];
# ifdef ADDRESS_CHECK_OKAY /* Avoid gcc warning. */
/* C99 may plausibly be interpreted as not requiring support for a cast from
a variable's address to bool in a static initializer. So treat it like a
GCC extension. */
-# ifdef __GNUC__
+# if defined __GNUC__ || defined __clang__
bool e = &s;
# endif
# endif
@@ -73,7 +77,7 @@ char f[(_Bool) 0.0 == false ? 1 : -1];
#endif
char g[true];
char h[sizeof (_Bool)];
-#if HAVE_STDBOOL_H || 3 <= __GNUC__ /* See above. */
+#if HAVE_STDBOOL_H || 3 <= __GNUC__ || 4 <= __clang_major__ /* See above. */
char i[sizeof s.t];
#endif
enum { j = false, k = true, l = false * true, m = true * 256 };
@@ -92,7 +96,7 @@ main ()
{
int error = 0;
-#if HAVE_STDBOOL_H || 3 <= __GNUC__ /* See above. */
+#if HAVE_STDBOOL_H || 3 <= __GNUC_ || 4 <= __clang_major___ /* See above. */
# ifdef ADDRESS_CHECK_OKAY /* Avoid gcc warning. */
/* A cast from a variable's address to bool is valid in expressions. */
{