Fix putenv race conditions with undefined behavior.

[gnu-emacs] / admin / merge-gnulib

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 5b9b716bed22b6df48bf2e3a052956e574339903..dc3cd6cf5413da71bc1fd29925c0123db57c27fb 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -37,7 +37,7 @@ GNULIB_MODULES='
   pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
   sig2str socklen stat-time stdalign stdio
   strftime strtoimax strtoumax symlink sys_stat
-  sys_time time timer-time timespec-add timespec-sub
+  sys_time time time_r timer-time timespec-add timespec-sub
   unsetenv update-copyright utimens
   vla warnings
 '