diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2022-02-27 14:32:38 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-02-27 14:32:38 +0100 |
| commit | 6a10a3e8d489d7b4dcffd6b4c63cee77e73e2535 (patch) | |
| tree | 044830fcca341290bc678cd2126584ae72762129 /m4 | |
| parent | 704a40ad75fd01d7efafbb9db7b8d5ff403e44eb (diff) | |
| download | emacs-6a10a3e8d489d7b4dcffd6b4c63cee77e73e2535.tar.gz emacs-6a10a3e8d489d7b4dcffd6b4c63cee77e73e2535.tar.bz2 emacs-6a10a3e8d489d7b4dcffd6b4c63cee77e73e2535.zip | |
Merge from gnulib
* m4/gnulib-common.m4 (gl_COMMON_BODY):
* lib/gnulib.mk.in (CXXCPP):
* lib/cdefs.h: Updated with admin/merge-gnulib. (This is in
preparation to adding the nanosleep module later.)
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-common.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index dbc40796148..c5ced04f181 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -69,7 +69,9 @@ AC_DEFUN([gl_COMMON_BODY], [ [/* Attributes. */ #if (defined __has_attribute \ && (!defined __clang_minor__ \ - || 3 < __clang_major__ + (5 <= __clang_minor__))) + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))) # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr |