From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Sep 2025 10:45:45 +0000 (+0200)
Subject: readutmp: Remove support for OSF/1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a95a5a6be822babc4f653b509d43526e856a44c8;p=thirdparty%2Fgnulib.git

readutmp: Remove support for OSF/1.

* m4/readutmp.m4 (gl_PREREQ_READUTMP_H): Don't test for ut_termination,
ut_exit members.
* lib/readutmp.c (UT_EXIT_E_TERMINATION, UT_EXIT_E_EXIT): Don't access
ut_termination, ut_exit members.
---

diff --git a/ChangeLog b/ChangeLog
index e01ecffe91..53561a0d1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+	readutmp: Remove support for OSF/1.
+	* m4/readutmp.m4 (gl_PREREQ_READUTMP_H): Don't test for ut_termination,
+	ut_exit members.
+	* lib/readutmp.c (UT_EXIT_E_TERMINATION, UT_EXIT_E_EXIT): Don't access
+	ut_termination, ut_exit members.
+
 	random_r: Remove support for OSF/1.
 	* lib/stdlib.in.h: Don't include <random.h>.
 	* m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Don't initialize HAVE_RANDOM_H.
diff --git a/lib/readutmp.c b/lib/readutmp.c
index 9366dfa5c2..a34d5fde5f 100644
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -110,8 +110,6 @@
 #if HAVE_UTMPX_H
 # if HAVE_STRUCT_UTMPX_UT_EXIT_E_TERMINATION
 #  define UT_EXIT_E_TERMINATION(UT) ((UT)->ut_exit.e_termination)
-# elif HAVE_STRUCT_UTMPX_UT_EXIT_UT_TERMINATION /* OSF/1 */
-#  define UT_EXIT_E_TERMINATION(UT) ((UT)->ut_exit.ut_termination)
 # else
 #  define UT_EXIT_E_TERMINATION(UT) 0
 # endif
@@ -126,8 +124,6 @@
 #if HAVE_UTMPX_H
 # if HAVE_STRUCT_UTMPX_UT_EXIT_E_EXIT
 #  define UT_EXIT_E_EXIT(UT) ((UT)->ut_exit.e_exit)
-# elif HAVE_STRUCT_UTMPX_UT_EXIT_UT_EXIT /* OSF/1 */
-#  define UT_EXIT_E_EXIT(UT) ((UT)->ut_exit.ut_exit)
 # else
 #  define UT_EXIT_E_EXIT(UT) 0
 # endif
diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index 36c95be337..418c398b24 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,5 +1,5 @@
 # readutmp.m4
-# serial 31
+# serial 32
 dnl Copyright (C) 2002-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,
@@ -96,11 +96,9 @@ AC_INCLUDES_DEFAULT
     AC_CHECK_MEMBERS([struct utmpx.ut_exit],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmp.ut_exit],,,[$utmp_includes])
 
-    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_exit],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_exit],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmp.ut_exit.e_exit],,,[$utmp_includes])
 
-    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_termination],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_termination],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmp.ut_exit.e_termination],,,[$utmp_includes])
   fi