From: Po Lu Date: Sat, 11 Mar 2023 01:55:05 +0000 (+0800) Subject: Merge remote-tracking branch 'origin/master' into feature/android X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f573ce3f66daefbb26dec079581eb7cc755a9b3c;p=emacs.git Merge remote-tracking branch 'origin/master' into feature/android --- f573ce3f66daefbb26dec079581eb7cc755a9b3c diff --cc admin/merge-gnulib index 4e84e1a2c8d,917ddda1fd5..8065a9267d0 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@@ -42,11 -42,11 +42,11 @@@ GNULIB_MODULES= manywarnings memmem-simple mempcpy memrchr memset_explicit minmax mkostemp mktime nanosleep nproc nstrftime - pathmax pipe2 pselect pthread_sigmask + pathmax pipe2 printf-posix vasprintf-posix pselect pthread_sigmask qcopy-acl readlink readlinkat regex sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stddef stdio - stpcpy strnlen strtoimax symlink sys_stat sys_time + stpcpy stpncpy 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 ' diff --cc lib/gnulib.mk.in index a5be32427b6,47d08a5e27f..ca4df18458c --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@@ -719,9 -595,7 +719,10 @@@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVE GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TANF = @GL_GNULIB_TANF@ +GL_GNULIB_TANHF = @GL_GNULIB_TANHF@ +GL_GNULIB_TANL = @GL_GNULIB_TANL@ + GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@@ -1533,8 -1210,7 +1534,9 @@@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TANF = @REPLACE_TANF@ +REPLACE_TANHF = @REPLACE_TANHF@ + REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@