summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2023-03-10 16:51:41 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2023-03-10 16:53:07 -0800
commitc6bfffa9fe1af7f4f806e5533ba5f3c33476cf9a (patch)
tree444e6a5ada6a746274541ac6cda6b1cc2795a442 /admin
parentd236ab09300070696f21ebfda49678b11c2327eb (diff)
downloademacs-c6bfffa9fe1af7f4f806e5533ba5f3c33476cf9a.tar.gz
Update from Gnulib by running admin/merge-gnulib
Run admin/merge-gnulib along with the following change: * admin/merge-gnulib (GNULIB_MODULES): Replace ‘time’ with ‘time-h’, adjusting to a recent renaming in Gnulib modules. Emacs doesn’t appear to need the new Gnulib ‘time’ module.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/merge-gnulib2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 04e3e34b9f9..917ddda1fd5 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -46,7 +46,7 @@ GNULIB_MODULES='
qcopy-acl readlink readlinkat regex
sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stddef stdio
stpcpy strnlen strtoimax symlink sys_stat sys_time
- tempname time time_r time_rz timegm timer-time timespec-add timespec-sub
+ tempname time-h time_r time_rz timegm timer-time timespec-add timespec-sub
update-copyright unlocked-io utimensat
vla warnings
'