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 /lib | |
| parent | 704a40ad75fd01d7efafbb9db7b8d5ff403e44eb (diff) | |
| download | emacs-6a10a3e8d489d7b4dcffd6b4c63cee77e73e2535.tar.gz | |
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 'lib')
| -rw-r--r-- | lib/cdefs.h | 4 | ||||
| -rw-r--r-- | lib/gnulib.mk.in | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/cdefs.h b/lib/cdefs.h index 44d3826bca9..cb2514504f1 100644 --- a/lib/cdefs.h +++ b/lib/cdefs.h @@ -41,7 +41,9 @@ Similarly for __has_builtin, etc. */ #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 __glibc_has_attribute(attr) __has_attribute (attr) #else # define __glibc_has_attribute(attr) 0 diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index 6b90a80f64a..3a9f5b9818e 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -207,7 +207,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CRYPTOLIB = @CRYPTOLIB@ CXX = @CXX@ -CXXCPP = @CXXCPP@ CXXFLAGS = @CXXFLAGS@ CYGWIN_OBJ = @CYGWIN_OBJ@ C_SWITCH_MACHINE = @C_SWITCH_MACHINE@ |