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.
* m4/random_r.m4 (gl_FUNC_RANDOM_R): Don't set HAVE_RANDOM_H. Don't set
REPLACE_RANDOM_R on OSF/1.
* modules/stdlib-h (Makefile.am): Don't substitute HAVE_RANDOM_H.

diff --git a/ChangeLog b/ChangeLog
index 79e32a5d0d47166cc7225c95c94a9995333252ab..e01ecffe91a1683054ac2d3e62d8e60f2cb89aa3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+       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.
+       * m4/random_r.m4 (gl_FUNC_RANDOM_R): Don't set HAVE_RANDOM_H. Don't set
+       REPLACE_RANDOM_R on OSF/1.
+       * modules/stdlib-h (Makefile.am): Don't substitute HAVE_RANDOM_H.
+
        ptsname_r: Remove support for OSF/1.
        * m4/ptsname_r.m4 (gl_FUNC_PTSNAME_R): Remove test for non-standard
        signature of ptsname_r.

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index d74db3c7c7352142be81e4d245ad326993c1009e..bef0aaaf92e7a7eae894274f91ce8588fa34466a 100644 (file)
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -77,13 +77,6 @@
 
 #if @GNULIB_RANDOM_R@
 
-/* OSF/1 5.1 declares 'struct random_data' in <random.h>, which is included
-   from <stdlib.h> if _REENTRANT is defined.  Include it whenever we need
-   'struct random_data'.  */
-# if @HAVE_RANDOM_H@
-#  include <random.h>
-# endif
-
 # include <stdint.h>
 
 # if !@HAVE_STRUCT_RANDOM_DATA@

diff --git a/m4/random_r.m4 b/m4/random_r.m4
index 50ee48d4622874112d089017f74f9dfa93bff18a..e4c36c4c6f631874def5b700a06535a21710174b 100644 (file)
--- a/m4/random_r.m4
+++ b/m4/random_r.m4
@@ -1,5 +1,5 @@
 # random_r.m4
-# serial 5
+# serial 6
 dnl Copyright (C) 2008-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,
@@ -12,9 +12,6 @@ AC_DEFUN([gl_FUNC_RANDOM_R],
   AC_REQUIRE([AC_CANONICAL_HOST])
 
   AC_CHECK_HEADERS([random.h], [], [], [AC_INCLUDES_DEFAULT])
-  if test $ac_cv_header_random_h = no; then
-    HAVE_RANDOM_H=0
-  fi
 
   AC_CHECK_TYPES([struct random_data],
     [], [HAVE_STRUCT_RANDOM_DATA=0],
@@ -24,10 +21,10 @@ AC_DEFUN([gl_FUNC_RANDOM_R],
       #endif
     ]])
 
-  dnl On AIX and OSF/1, these functions exist, but with different declarations.
+  dnl On AIX, these functions exist, but with different declarations.
   dnl Override them all.
   case "$host_os" in
-    aix* | osf*)
+    aix*)
       REPLACE_RANDOM_R=1
       ;;
     *)

diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 2d25da37b530568fc48b750a28e818a663cec0d0..ab2e87019bb8b58e7ca233e572208473f0b77ffe 100644 (file)
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
 # stdlib_h.m4
-# serial 84
+# serial 85
 dnl Copyright (C) 2007-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,
@@ -205,7 +205,6 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_PTSNAME_R=1;          AC_SUBST([HAVE_PTSNAME_R])
   HAVE_QSORT_R=1;            AC_SUBST([HAVE_QSORT_R])
   HAVE_RANDOM=1;             AC_SUBST([HAVE_RANDOM])
-  HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
   HAVE_REALLOCARRAY=1;       AC_SUBST([HAVE_REALLOCARRAY])
   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])

diff --git a/modules/stdlib-h b/modules/stdlib-h
index 10fb93b700026d6b4450cac5b8b7c54ab1310ff2..7f479d000c260db6496bab99ab03ab8a7281d32c 100644 (file)
--- a/modules/stdlib-h
+++ b/modules/stdlib-h
@@ -118,7 +118,6 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
              -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
              -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \
              -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
-             -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
              -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
              -e 's|@''HAVE_REALLOCARRAY''@|$(HAVE_REALLOCARRAY)|g' \
              -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \