Sync with the latest Gnulib code (6f2d632)

1 files changed, 5 insertions, 3 deletions

diff --git a/gl/Makefile.am b/gl/Makefile.am
index e9e2302..edc7db1 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -1182,6 +1182,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
+              -e 's|@''GNULIB__EXIT''@|$(GNULIB__EXIT)|g' \
               -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
               -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
               -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
@@ -1206,13 +1207,12 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
               -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
               -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
+              -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
               -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
-              -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
               -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
               -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
               -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
               -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
-              -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
               -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
               -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
               -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
@@ -1221,7 +1221,6 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
               -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
               -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
-              -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
               -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
               -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
               -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
@@ -1232,9 +1231,12 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
               -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
               -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
+              -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
               -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
+              -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
               -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
               -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+              -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
               -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
               -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
               -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \