assert-h: Remove support for IRIX.

* m4/assert_h.m4 (gl_ASSERT_H): Remove workaround for IRIX.

diff --git a/ChangeLog b/ChangeLog
index bdac14fbfa433dbe41026ae0ae1bf54ffde9389b..9956430c537ad86dddaa5d2997b5132383ecd098 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2025-09-10  Bruno Haible  <bruno@clisp.org>
 
+       assert-h: Remove support for IRIX.
+       * m4/assert_h.m4 (gl_ASSERT_H): Remove workaround for IRIX.
+
        iconv_open: Remove support for IRIX.
        * m4/iconv_open.m4 (gl_FUNC_ICONV_OPEN): Remove code for IRIX.
        * lib/iconv_open.c (ICONV_FLAVOR_IRIX): Remove macro.

diff --git a/m4/assert_h.m4 b/m4/assert_h.m4
index e77524caff9ecccb8b9f4a4d4c0279f0c81f3d71..b02cbd6810c0acd7df5fe7aec5b6d6f64f617fc9 100644 (file)
--- a/m4/assert_h.m4
+++ b/m4/assert_h.m4
@@ -1,5 +1,5 @@
 # assert_h.m4
-# serial 5
+# serial 6
 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,
@@ -56,8 +56,6 @@ AC_DEFUN([gl_ASSERT_H],
   dnl The seemingly redundant parentheses are necessary for MSVC 14.
   dnl #undef assert so that programs are not tempted to use it without
   dnl specifically including assert.h.
-  dnl #undef __ASSERT_H__ so that on IRIX, when programs later include
-  dnl <assert.h>, this include actually defines assert.
   dnl Break the #undef_s apart with a comment so that 'configure' does
   dnl not comment them out.
   AH_VERBATIM([zzstatic_assert],
@@ -78,9 +76,6 @@ AC_DEFUN([gl_ASSERT_H],
              && __GNUG__ < 6 && __clang_major__ < 6)))
  #include <assert.h>
  #undef/**/assert
- #ifdef __sgi
-  #undef/**/__ASSERT_H__
- #endif
  /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments.
     We need it also to be invocable with a single argument.
     Haiku 2022 <assert.h> does not define static_assert at all.  */