Merge from gnulib.

3 files changed, 24 insertions, 18 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 5e170d155e8..f45a086bb1f 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -918,7 +918,8 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''GNULIB_SYSTEM_POSIX''@|$(GNULIB_SYSTEM_POSIX)|g' \
               -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
               -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
-              -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+              < $(srcdir)/stdlib.in.h | \
+          sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
               -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
               -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
               -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
@@ -954,8 +955,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-              < $(srcdir)/stdlib.in.h; \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
         } > $@-t && \
         mv $@-t $@
 
@@ -1080,7 +1080,8 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
               -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
               -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-              -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+          | \
+          sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
               -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
               -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
               -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index ffd175d58c8..0e7263a002b 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -223,7 +223,8 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''GNULIB_SYSTEM_POSIX''@|$(GNULIB_SYSTEM_POSIX)|g' \
               -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
               -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
-              -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+              < $(srcdir)/stdlib.in.h | \
+          sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
               -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
               -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
               -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
@@ -259,8 +260,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-              < $(srcdir)/stdlib.in.h; \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
         } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
@@ -421,7 +421,8 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
               -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
               -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-              -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+          | \
+          sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
               -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
               -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
               -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index b3bb9d4e5de..6e69a277af0 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -49,20 +49,23 @@
 # include <sys/loadavg.h>
 #endif
 
+#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 always.  */
-#if @HAVE_RANDOM_H@
-# include <random.h>
-#endif
+   from <stdlib.h> if _REENTRANT is defined.  Include it whenever we need
+   'struct random_data'.  */
+# if @HAVE_RANDOM_H@
+#  include <random.h>
+# endif
 
-#if !@HAVE_STRUCT_RANDOM_DATA@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@)
-# include <stdint.h>
-#endif
+# if !@HAVE_STRUCT_RANDOM_DATA@ || !@HAVE_RANDOM_R@
+#  include <stdint.h>
+# endif
 
-#if !@HAVE_STRUCT_RANDOM_DATA@
+# if !@HAVE_STRUCT_RANDOM_DATA@
 /* Define 'struct random_data'.
    But allow multiple gnulib generated <stdlib.h> replacements to coexist.  */
-# if !GNULIB_defined_struct_random_data
+#  if !GNULIB_defined_struct_random_data
 struct random_data
 {
   int32_t *fptr;                /* Front pointer.  */
@@ -73,7 +76,8 @@ struct random_data
   int rand_sep;                 /* Distance between front and rear.  */
   int32_t *end_ptr;             /* Pointer behind state table.  */
 };
-#  define GNULIB_defined_struct_random_data 1
+#   define GNULIB_defined_struct_random_data 1
+#  endif
 # endif
 #endif