From: Po Lu Date: Mon, 15 May 2023 02:38:10 +0000 (+0800) Subject: Merge remote-tracking branch 'origin/master' into feature/android X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a46e231a5f27c46933cc53865cee452ad1a0c0d3;p=emacs.git Merge remote-tracking branch 'origin/master' into feature/android --- a46e231a5f27c46933cc53865cee452ad1a0c0d3 diff --cc admin/merge-gnulib index 8065a9267d0,97487381886..76e2a02558c --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@@ -42,13 -42,13 +42,13 @@@ 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-h time_r time_rz timegm timer-time timespec-add timespec-sub update-copyright unlocked-io utimensat - vla warnings + vla warnings year2038 ' AVOIDED_MODULES=' diff --cc lib/gnulib.mk.in index 94fd1d5bec9,5722e2588eb..e447a2c4054 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@@ -169,9 -166,9 +169,10 @@@ # unlocked-io \ # update-copyright \ # utimensat \ +# vasprintf-posix \ # vla \ - # warnings + # warnings \ + # year2038 MOSTLYCLEANFILES += core *.stackdump @@@ -858,13 -692,8 +861,14 @@@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_POSIX_SPAWN_SETSID = @HAVE_DECL_POSIX_SPAWN_SETSID@ + HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@ HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ +HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@ +HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@ +HAVE_DECL_RINTF = @HAVE_DECL_RINTF@ +HAVE_DECL_ROUND = @HAVE_DECL_ROUND@ +HAVE_DECL_ROUNDF = @HAVE_DECL_ROUNDF@ +HAVE_DECL_ROUNDL = @HAVE_DECL_ROUNDL@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@@ -1487,11 -1181,8 +1495,15 @@@ REPLACE_REMAINDERL = @REPLACE_REMAINDER REPLACE_REMOVE = @REPLACE_REMOVE@ REPLACE_RENAME = @REPLACE_RENAME@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@ ++<<<<<<< HEAD +REPLACE_RINTL = @REPLACE_RINTL@ ++======= + REPLACE_REWINDDIR = @REPLACE_REWINDDIR@ ++>>>>>>> origin/master REPLACE_RMDIR = @REPLACE_RMDIR@ +REPLACE_ROUND = @REPLACE_ROUND@ +REPLACE_ROUNDF = @REPLACE_ROUNDF@ +REPLACE_ROUNDL = @REPLACE_ROUNDL@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ diff --cc m4/gnulib-comp.m4 index 9586b5d6486,882b5869755..9f701e95211 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@@ -193,9 -176,9 +193,10 @@@ AC_DEFUN([gl_EARLY] # Code from module stddef: # Code from module stdint: # Code from module stdio: + gl_STDIO_H_EARLY # Code from module stdlib: # Code from module stpcpy: + # Code from module stpncpy: # Code from module string: # Code from module strnlen: # Code from module strtoimax: @@@ -231,7 -210,8 +232,12 @@@ # Code from module vla: # Code from module warnings: # Code from module xalloc-oversized: ++<<<<<<< HEAD + # Code from module xsize: ++======= + # Code from module year2038: + AC_REQUIRE([AC_SYS_YEAR2038]) ++>>>>>>> origin/master ]) # This macro should be invoked from ./configure.ac, in the section @@@ -736,16 -658,12 +742,16 @@@ AC_DEFUN([gl_INIT] gl_gnulib_enabled_d3b2383720ee0e541357aa2aac598e2b=false gl_gnulib_enabled_61bcaca76b3e6f9ae55d57a1c3193bc4=false gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c=false + gl_gnulib_enabled_size_max=false gl_gnulib_enabled_strtoll=false gl_gnulib_enabled_utimens=false + gl_gnulib_enabled_vasnprintf=false + gl_gnulib_enabled_ed5616be3593d355b981ffab56b9f37b=false gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec=false + gl_gnulib_enabled_xsize=false func_gl_gnulib_m4code_260941c0e5dc67ec9e87d1fb321c300b () { - if ! $gl_gnulib_enabled_260941c0e5dc67ec9e87d1fb321c300b; then + if $gl_gnulib_enabled_260941c0e5dc67ec9e87d1fb321c300b; then :; else AC_REQUIRE([AC_CANONICAL_HOST]) gl_gnulib_enabled_260941c0e5dc67ec9e87d1fb321c300b=true if case $host_os in mingw*) false;; *) :;; esac; then @@@ -795,30 -713,9 +801,30 @@@ func_gl_gnulib_m4code_6099e9737f757db36c47fa9d9f02e88c fi } + func_gl_gnulib_m4code_fseterr () + { + if ! $gl_gnulib_enabled_fseterr; then + gl_FUNC_FSETERR + gl_CONDITIONAL([GL_COND_OBJ_FSETERR], [test $ac_cv_func___fseterr = no]) + gl_gnulib_enabled_fseterr=true + fi + } + func_gl_gnulib_m4code_getdelim () + { + if ! $gl_gnulib_enabled_getdelim; then + gl_FUNC_GETDELIM + gl_CONDITIONAL([GL_COND_OBJ_GETDELIM], + [test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]) + AM_COND_IF([GL_COND_OBJ_GETDELIM], [ + gl_PREREQ_GETDELIM + ]) + gl_STDIO_MODULE_INDICATOR([getdelim]) + gl_gnulib_enabled_getdelim=true + fi + } func_gl_gnulib_m4code_getdtablesize () { - if ! $gl_gnulib_enabled_getdtablesize; then + if $gl_gnulib_enabled_getdtablesize; then :; else gl_FUNC_GETDTABLESIZE gl_CONDITIONAL([GL_COND_OBJ_GETDTABLESIZE], [test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1]) @@@ -884,20 -781,9 +890,20 @@@ fi fi } + func_gl_gnulib_m4code_3f0e593033d1fc2c127581960f641b66 () + { + if ! $gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66; then + gl_FUNC_ISNANF_NO_LIBM + if test $gl_func_isnanf_no_libm != yes; then + AC_LIBOBJ([isnanf]) + gl_PREREQ_ISNANF + fi + gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66=true + fi + } func_gl_gnulib_m4code_lchmod () { - if ! $gl_gnulib_enabled_lchmod; then + if $gl_gnulib_enabled_lchmod; then :; else gl_FUNC_LCHMOD gl_CONDITIONAL([GL_COND_OBJ_LCHMOD], [test $HAVE_LCHMOD = 0]) AM_COND_IF([GL_COND_OBJ_LCHMOD], [ @@@ -1021,16 -907,9 +1027,16 @@@ gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c=true fi } + func_gl_gnulib_m4code_size_max () + { + if ! $gl_gnulib_enabled_size_max; then + gl_SIZE_MAX + gl_gnulib_enabled_size_max=true + fi + } func_gl_gnulib_m4code_strtoll () { - if ! $gl_gnulib_enabled_strtoll; then + if $gl_gnulib_enabled_strtoll; then :; else gl_FUNC_STRTOLL gl_CONDITIONAL([GL_COND_OBJ_STRTOLL], [test $HAVE_STRTOLL = 0 || test $REPLACE_STRTOLL = 1]) @@@ -1048,33 -927,9 +1054,33 @@@ gl_gnulib_enabled_utimens=true fi } + func_gl_gnulib_m4code_vasnprintf () + { + if ! $gl_gnulib_enabled_vasnprintf; then + AC_REQUIRE([AC_C_RESTRICT]) + gl_FUNC_VASNPRINTF + gl_gnulib_enabled_vasnprintf=true + func_gl_gnulib_m4code_xsize + fi + } + func_gl_gnulib_m4code_ed5616be3593d355b981ffab56b9f37b () + { + if ! $gl_gnulib_enabled_ed5616be3593d355b981ffab56b9f37b; then + gl_FUNC_VFPRINTF_POSIX + gl_STDIO_MODULE_INDICATOR([vfprintf-posix]) + gl_MODULE_INDICATOR([vfprintf-posix]) + gl_gnulib_enabled_ed5616be3593d355b981ffab56b9f37b=true + if test $REPLACE_VFPRINTF = 1; then + func_gl_gnulib_m4code_fseterr + fi + if test $REPLACE_VFPRINTF = 1; then + func_gl_gnulib_m4code_vasnprintf + fi + fi + } func_gl_gnulib_m4code_682e609604ccaac6be382e4ee3a4eaec () { - if ! $gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec; then + if $gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec; then :; else gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec=true fi } @@@ -1699,17 -1474,12 +1707,18 @@@ AC_DEFUN([gl_FILE_LIST], m4/group-member.m4 m4/ieee754-h.m4 m4/include_next.m4 + m4/intmax_t.m4 m4/inttypes.m4 + m4/inttypes_h.m4 + m4/isnand.m4 + m4/isnanf.m4 + m4/isnanl.m4 m4/largefile.m4 m4/lchmod.m4 + m4/ldexpl.m4 m4/libgmp.m4 m4/limits-h.m4 + m4/locale-fr.m4 m4/lstat.m4 m4/malloc.m4 m4/manywarnings-c++.m4 diff --cc src/lisp.h index 5a07bda3592,c9a64f07427..79c96e11da8 --- a/src/lisp.h +++ b/src/lisp.h @@@ -28,13 -28,9 +28,14 @@@ along with GNU Emacs. If not, see #include #include +#include + +#ifdef HAVE_SYS_STAT_H +#include +#endif #include + #include #include #include