diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-01-31 22:34:48 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-01-31 22:34:48 -0700 |
| commit | d4d613629b59d2eadd80026cab6c9dabc92cab24 (patch) | |
| tree | d31086a817251dddb847d027661d218c1ecd6540 /src/emacs-module.h.in | |
| parent | fdb813e529602914360fc2d0cf22e42e32e6905f (diff) | |
| parent | a5438ee11ad052e71334dcfb2db51fb9123411e5 (diff) | |
| download | emacs-d4d613629b59d2eadd80026cab6c9dabc92cab24.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'src/emacs-module.h.in')
| -rw-r--r-- | src/emacs-module.h.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/emacs-module.h.in b/src/emacs-module.h.in index 2989b439109..fe52587c1a5 100644 --- a/src/emacs-module.h.in +++ b/src/emacs-module.h.in @@ -51,7 +51,9 @@ information how to write modules and use this header file. #if 3 < __GNUC__ + (3 <= __GNUC_MINOR__) # define EMACS_ATTRIBUTE_NONNULL(...) \ __attribute__ ((__nonnull__ (__VA_ARGS__))) -#elif defined __has_attribute +#elif (defined __has_attribute \ + && (!defined __clang_minor__ \ + || 3 < __clang_major__ + (5 <= __clang_minor__))) # if __has_attribute (__nonnull__) # define EMACS_ATTRIBUTE_NONNULL(...) \ __attribute__ ((__nonnull__ (__VA_ARGS__))) |