From: Bruno Haible Date: Tue, 14 Jan 2025 21:47:43 +0000 (+0100) Subject: assert-h: Fix compilation error with gcc >= 13 on Solaris 11. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=773632e8ea87d692753720c9543a04f32381aaf8;p=gnulib.git assert-h: Fix compilation error with gcc >= 13 on Solaris 11. Reported by Pádraig Brady in . * m4/assert_h.m4 (gl_ASSERT_H): Don't assume that on Solaris with gcc or clang, static_assert works: /usr/include/assert.h is in the way. --- diff --git a/ChangeLog b/ChangeLog index 39f4af7c24..bef68432ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2025-01-14 Bruno Haible + + assert-h: Fix compilation error with gcc >= 13 on Solaris 11. + Reported by Pádraig Brady in + . + * m4/assert_h.m4 (gl_ASSERT_H): Don't assume that on Solaris with gcc or + clang, static_assert works: /usr/include/assert.h is in the way. + 2025-01-14 Simon Josefsson git-version-gen: Fix makefile rule typo, suggested by Bruno. diff --git a/m4/assert_h.m4 b/m4/assert_h.m4 index 91f446e7f6..e77524caff 100644 --- a/m4/assert_h.m4 +++ b/m4/assert_h.m4 @@ -1,5 +1,5 @@ # assert_h.m4 -# serial 4 +# serial 5 dnl Copyright (C) 2011-2025 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -64,11 +64,13 @@ AC_DEFUN([gl_ASSERT_H], [#if (!(defined __clang__ \ ? (defined __cplusplus \ ? __cplusplus >= 201703L \ - : __STDC_VERSION__ >= 202000L && __clang_major__ >= 16) \ + : __STDC_VERSION__ >= 202000L && __clang_major__ >= 16 \ + && !defined __sun) \ : (defined __GNUC__ \ ? (defined __cplusplus \ ? __cplusplus >= 201103L && __GNUG__ >= 6 \ - : __STDC_VERSION__ >= 202000L && __GNUC__ >= 13) \ + : __STDC_VERSION__ >= 202000L && __GNUC__ >= 13 \ + && !defined __sun) \ : defined HAVE_C_STATIC_ASSERT)) \ && !defined assert \ && (!defined __cplusplus \