diff options
Diffstat (limited to 'gl/m4/assert_h.m4')
| -rw-r--r-- | gl/m4/assert_h.m4 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gl/m4/assert_h.m4 b/gl/m4/assert_h.m4 index e77524ca..d9433ef7 100644 --- a/gl/m4/assert_h.m4 +++ b/gl/m4/assert_h.m4 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # assert_h.m4 | 1 | # assert_h.m4 |
| 2 | # serial 5 | 2 | # serial 6 |
| 3 | dnl Copyright (C) 2011-2025 Free Software Foundation, Inc. | 3 | dnl Copyright (C) 2011-2026 Free Software Foundation, Inc. |
| 4 | dnl This file is free software; the Free Software Foundation | 4 | dnl This file is free software; the Free Software Foundation |
| 5 | dnl gives unlimited permission to copy and/or distribute it, | 5 | dnl gives unlimited permission to copy and/or distribute it, |
| 6 | dnl with or without modifications, as long as this notice is preserved. | 6 | dnl with or without modifications, as long as this notice is preserved. |
| @@ -56,8 +56,6 @@ AC_DEFUN([gl_ASSERT_H], | |||
| 56 | dnl The seemingly redundant parentheses are necessary for MSVC 14. | 56 | dnl The seemingly redundant parentheses are necessary for MSVC 14. |
| 57 | dnl #undef assert so that programs are not tempted to use it without | 57 | dnl #undef assert so that programs are not tempted to use it without |
| 58 | dnl specifically including assert.h. | 58 | dnl specifically including assert.h. |
| 59 | dnl #undef __ASSERT_H__ so that on IRIX, when programs later include | ||
| 60 | dnl <assert.h>, this include actually defines assert. | ||
| 61 | dnl Break the #undef_s apart with a comment so that 'configure' does | 59 | dnl Break the #undef_s apart with a comment so that 'configure' does |
| 62 | dnl not comment them out. | 60 | dnl not comment them out. |
| 63 | AH_VERBATIM([zzstatic_assert], | 61 | AH_VERBATIM([zzstatic_assert], |
| @@ -78,9 +76,6 @@ AC_DEFUN([gl_ASSERT_H], | |||
| 78 | && __GNUG__ < 6 && __clang_major__ < 6))) | 76 | && __GNUG__ < 6 && __clang_major__ < 6))) |
| 79 | #include <assert.h> | 77 | #include <assert.h> |
| 80 | #undef/**/assert | 78 | #undef/**/assert |
| 81 | #ifdef __sgi | ||
| 82 | #undef/**/__ASSERT_H__ | ||
| 83 | #endif | ||
| 84 | /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments. | 79 | /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments. |
| 85 | We need it also to be invocable with a single argument. | 80 | We need it also to be invocable with a single argument. |
| 86 | Haiku 2022 <assert.h> does not define static_assert at all. */ | 81 | Haiku 2022 <assert.h> does not define static_assert at all. */ |
