From: Po Lu Date: Sun, 5 Feb 2023 12:55:21 +0000 (+0800) Subject: Merge remote-tracking branch 'origin/master' into feature/android X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ee01457a84e031d490553949a2deacd4865a5bb;p=emacs.git Merge remote-tracking branch 'origin/master' into feature/android --- 0ee01457a84e031d490553949a2deacd4865a5bb diff --cc admin/merge-gnulib index 7d0f2186368,04e3e34b9f9..2054fc5b3ec --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@@ -42,9 -42,9 +42,9 @@@ 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 stdalign stdbool stddef stdio + 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 update-copyright unlocked-io utimensat diff --cc lib/gnulib.mk.in index c27fa841863,53a821b141e..e55cff0df6a --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@@ -934,11 -742,6 +933,14 @@@ HAVE_GETUMASK = @HAVE_GETUMASK HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ HAVE_GSETTINGS = @HAVE_GSETTINGS@ ++<<<<<<< HEAD +HAVE_HYPOTF = @HAVE_HYPOTF@ +HAVE_HYPOTL = @HAVE_HYPOTL@ +HAVE_ILOGB = @HAVE_ILOGB@ +HAVE_ILOGBF = @HAVE_ILOGBF@ +HAVE_ILOGBL = @HAVE_ILOGBL@ ++======= ++>>>>>>> origin/master HAVE_IMAXABS = @HAVE_IMAXABS@ HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@@ -1391,13 -1113,6 +1393,16 @@@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ ++<<<<<<< HEAD +REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@ +REPLACE_HYPOT = @REPLACE_HYPOT@ +REPLACE_HYPOTF = @REPLACE_HYPOTF@ +REPLACE_HYPOTL = @REPLACE_HYPOTL@ +REPLACE_ILOGB = @REPLACE_ILOGB@ +REPLACE_ILOGBF = @REPLACE_ILOGBF@ +REPLACE_ILOGBL = @REPLACE_ILOGBL@ ++======= ++>>>>>>> origin/master REPLACE_IMAXABS = @REPLACE_IMAXABS@ REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@@ -1568,9 -1240,7 +1573,8 @@@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUF SIZEOF_LONG = @SIZEOF_LONG@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ SMALL_JA_DIC = @SMALL_JA_DIC@ +SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ SQLITE3_LIBS = @SQLITE3_LIBS@ - STDALIGN_H = @STDALIGN_H@ STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ @@@ -3767,35 -2928,6 +3771,38 @@@ EXTRA_DIST += stat-time. endif ## end gnulib module stat-time ++<<<<<<< HEAD +## begin gnulib module stdalign +ifeq (,$(OMIT_GNULIB_MODULE_stdalign)) + +BUILT_SOURCES += $(STDALIGN_H) + +# We need the following in order to create when the system +# doesn't have one that works. +ifneq (,$(GL_GENERATE_STDALIGN_H_CONDITION)) +stdalign.h: stdalign.in.h $(top_builddir)/config.status + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_STDALIGN_H''@|$(HAVE_STDALIGN_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDALIGN_H''@|$(NEXT_STDALIGN_H)|g' \ + $(srcdir)/stdalign.in.h > $@-t + $(AM_V_at)mv $@-t $@ +else +stdalign.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += stdalign.h stdalign.h-t + +EXTRA_DIST += stdalign.in.h + +endif +## end gnulib module stdalign + ++======= ++>>>>>>> origin/master ## begin gnulib module stdckdint ifeq (,$(OMIT_GNULIB_MODULE_stdckdint)) diff --cc m4/gnulib-common.m4 index 0f1a6ac1ead,c0181abdc50..adcdd70b6c5 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD +# gnulib-common.m4 serial 78 ++======= + # gnulib-common.m4 serial 80 ++>>>>>>> origin/master dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@@ -351,9 -351,15 +355,21 @@@ AC_DEFUN([gl_COMMON_BODY], in C++ also: class. */ /* In C++ and C23, this is spelled [[__maybe_unused__]]. GCC's syntax is __attribute__ ((__unused__)). ++<<<<<<< HEAD + clang supports both syntaxes. */ +#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED +# ifdef __has_c_attribute ++======= + clang supports both syntaxes. Except that with clang ≥ 6, < 10, in C++ mode, + __has_c_attribute (__maybe_unused__) yields true but the use of + [[__maybe_unused__]] nevertheless produces a warning. */ + #ifndef _GL_ATTRIBUTE_MAYBE_UNUSED + # if defined __clang__ && defined __cplusplus + # if __clang_major__ >= 10 + # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] + # endif + # elif defined __has_c_attribute ++>>>>>>> origin/master # if __has_c_attribute (__maybe_unused__) # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] # endif @@@ -373,7 -379,16 +389,20 @@@ the return value, unless the caller uses something like ignore_value. */ /* Applies to: function, enumeration, class. */ #ifndef _GL_ATTRIBUTE_NODISCARD ++<<<<<<< HEAD +# ifdef __has_c_attribute ++======= + # if defined __clang__ && defined __cplusplus + /* With clang up to 15.0.6 (at least), in C++ mode, [[__nodiscard__]] produces + a warning. + The 1000 below means a yet unknown threshold. When clang++ version X + starts supporting [[__nodiscard__]] without warning about it, you can + replace the 1000 with X. */ + # if __clang_major__ >= 1000 + # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] + # endif + # elif defined __has_c_attribute ++>>>>>>> origin/master # if __has_c_attribute (__nodiscard__) # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] # endif diff --cc m4/gnulib-comp.m4 index 0d292d1c2f6,0658652a99e..7f0af5965cb --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@@ -1127,9 -975,6 +1123,12 @@@ AC_DEFUN([gl_INIT] if test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1; then func_gl_gnulib_m4code_utimens fi ++<<<<<<< HEAD + if test $REPLACE_GETLINE = 1; then + func_gl_gnulib_m4code_getdelim + fi ++======= ++>>>>>>> origin/master if case $host_os in mingw*) false;; *) test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1;; esac; then func_gl_gnulib_m4code_open fi @@@ -1576,13 -1371,8 +1575,12 @@@ AC_DEFUN([gl_FILE_LIST], lib/sig2str.h lib/sigdescr_np.c lib/signal.in.h + lib/signbitd.c + lib/signbitf.c + lib/signbitl.c + lib/size_max.h lib/stat-time.c lib/stat-time.h - lib/stdalign.in.h lib/stdckdint.in.h lib/stddef.in.h lib/stdint.in.h