diff options
| author | Paul Eggert | 2020-05-09 08:47:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2020-05-09 08:50:57 -0700 |
| commit | ebfb2c4d1bc8f68a75b02a76ec90eb225123c099 (patch) | |
| tree | 789194d7ff4743ec48ea9d47a8c7ee08471cecdf /m4 | |
| parent | ae3c510696f02f01d03052f070e5ce65b4018a45 (diff) | |
| download | emacs-ebfb2c4d1bc8f68a75b02a76ec90eb225123c099.tar.gz emacs-ebfb2c4d1bc8f68a75b02a76ec90eb225123c099.zip | |
Update from Gnulib
This incorporates:
2020-05-09 stdio: don't redefine _GL_ATTRIBUTE_FORMAT
2020-05-09 dirent, stdlib, string: don't redefine _GL_ATTRIBUTE_PURE
2020-05-08 limits-h: define LONG_BIT correctly on Haiku/x86_64
2020-05-08 ignore-value tests: use module 'attribute'
2020-05-06 attribute: minor style fixes
* build-aux/config.sub, doc/misc/texinfo.tex, lib/attribute.h:
* lib/dirent.in.h, lib/limits.in.h, lib/stdio.in.h, lib/stdlib.in.h:
* lib/string.in.h, m4/gnulib-common.m4:
Copy from Gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-common.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index b0010d0e351..f4ba5e3a00d 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # gnulib-common.m4 serial 49 | 1 | # gnulib-common.m4 serial 50 |
| 2 | dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. |
| 3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
| 4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
| @@ -96,7 +96,7 @@ AC_DEFUN([gl_COMMON_BODY], [ | |||
| 96 | # define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) | 96 | # define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) |
| 97 | # define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) | 97 | # define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) |
| 98 | # define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) | 98 | # define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) |
| 99 | # define _GL_ATTR_warn_unused_result_GL_GNUC_PREREQ (3, 4) | 99 | # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) |
| 100 | #endif | 100 | #endif |
| 101 | 101 | ||
| 102 | ]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. | 102 | ]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. |
| @@ -122,7 +122,7 @@ AC_DEFUN([gl_COMMON_BODY], [ | |||
| 122 | /* Avoid __attribute__ ((cold)) on MinGW; see thread starting at | 122 | /* Avoid __attribute__ ((cold)) on MinGW; see thread starting at |
| 123 | <https://lists.gnu.org/r/emacs-devel/2019-04/msg01152.html>. */ | 123 | <https://lists.gnu.org/r/emacs-devel/2019-04/msg01152.html>. */ |
| 124 | #if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ | 124 | #if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ |
| 125 | # define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) | 125 | # define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) |
| 126 | #else | 126 | #else |
| 127 | # define _GL_ATTRIBUTE_COLD | 127 | # define _GL_ATTRIBUTE_COLD |
| 128 | #endif | 128 | #endif |
| @@ -142,8 +142,8 @@ AC_DEFUN([gl_COMMON_BODY], [ | |||
| 142 | #endif | 142 | #endif |
| 143 | 143 | ||
| 144 | #if _GL_HAS_ATTRIBUTE (error) | 144 | #if _GL_HAS_ATTRIBUTE (error) |
| 145 | # define _GL_ATTRIBUTE_ERROR(msg) __attribute__((__error__ (msg))) | 145 | # define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) |
| 146 | # define _GL_ATTRIBUTE_WARNING(msg) __attribute__((__warning__ (msg))) | 146 | # define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) |
| 147 | #else | 147 | #else |
| 148 | # define _GL_ATTRIBUTE_ERROR(msg) | 148 | # define _GL_ATTRIBUTE_ERROR(msg) |
| 149 | # define _GL_ATTRIBUTE_WARNING(msg) | 149 | # define _GL_ATTRIBUTE_WARNING(msg) |