diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-02-05 21:06:11 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-02-05 21:06:11 +0800 |
| commit | 1b8beed9608b56889f23b49704033ef6437462cd (patch) | |
| tree | 548adf2acbf33a53d5343f532b5ffcc3099d16d5 /m4 | |
| parent | 0ee01457a84e031d490553949a2deacd4865a5bb (diff) | |
| download | emacs-1b8beed9608b56889f23b49704033ef6437462cd.tar.gz | |
Update from gnulib
* admin/merge-gnulib (avoided_flags):
* cross/lib/cdefs.h (__bos):
(__glibc_unsigned_or_positive):
(__glibc_unsafe_len):
(__glibc_fortify):
(__glibc_fortify_n):
* cross/lib/isnan.c:
* cross/lib/libc-config.h:
* cross/lib/openat-proc.c (openat_proc_name):
* cross/lib/vasnprintf.c (VASNPRINTF):
* cross/lib/verify.h (_Static_assert):
(_GL_SA3):
* lib/gnulib.mk.in (HAVE_GRANTPT):
(HAVE_SPAWN_H):
(NEXT_AS_FIRST_DIRECTIVE_LIMITS_H):
(NEXT_LIMITS_H):
(REPLACE_GETSUBOPT):
(REPLACE_ILOGB):
(SYSTEM_TYPE):
(BUILT_SOURCES):
* lib/isnan.c:
* lib/vasnprintf.c (VASNPRINTF):
* lib/verify.h (_GL_SA3):
* m4/gnulib-common.m4 (gl_COMMON_BODY):
* m4/gnulib-comp.m4 (gl_INIT): Update from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-common.m4 | 14 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 3 |
2 files changed, 0 insertions, 17 deletions
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index adcdd70b6c5..c0181abdc50 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,8 +1,4 @@ -<<<<<<< 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, @@ -355,11 +351,6 @@ 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. */ @@ -369,7 +360,6 @@ AC_DEFUN([gl_COMMON_BODY], [ # 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 @@ -389,9 +379,6 @@ AC_DEFUN([gl_COMMON_BODY], [ 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. @@ -402,7 +389,6 @@ AC_DEFUN([gl_COMMON_BODY], [ # 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 --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 7f0af5965cb..55444bc1450 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1123,12 +1123,9 @@ 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 |