Use putenv+unsetenv instead of modifying environ directly.

[bpt/emacs.git] / admin / merge-gnulib

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index f7a675e..1f60bb2 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -29,12 +29,12 @@ GNULIB_MODULES='
   alloca-opt c-ctype c-strcase
   careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
   dtoastr dtotimespec dup2 environ execinfo faccessat
-  filemode getloadavg getopt-gnu gettime gettimeofday
+  fcntl-h filemode getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat
-  manywarnings mktime pselect pthread_sigmask readlink
-  socklen stat-time stdalign stdarg stdbool stdio
+  manywarnings mktime pselect pthread_sigmask putenv readlink
+  sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
-  sys_time time timer-time timespec-add timespec-sub utimens
+  sys_time time timer-time timespec-add timespec-sub unsetenv utimens
   warnings
 '