diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-24 17:41:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-06 23:01:34 +0100 |
| commit | d7b46ef1cf69c9fe5c4c36958ca5d5b40de8cf8d (patch) | |
| tree | 21af0743d7f06165e43d52b4c29fb5cfba60d937 /include/sal | |
| parent | 65b9c62354f77c0d3ff02dfa3151447c629ef419 (diff) | |
Remove obsolete GCC version checks
...after <https://gerrit.libreoffice.org/63951> "Bump (Linux) GCC baseline to
7.0.0". (In some cases, those checks now need to check for __clang__, which was
implicitly covered in the past by Clang consistently reporting to be
GCC 4.2.1.)
Change-Id: I860fef8c4ca41c22a7541f0fb2d34b37d1d69bed
Reviewed-on: https://gerrit.libreoffice.org/63952
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/sal')
| -rw-r--r-- | include/sal/types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sal/types.h b/include/sal/types.h index 6bf4de970f71..b687490ed949 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -678,7 +678,7 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) { #define __has_attribute(x) 0 #endif -#if defined LIBO_INTERNAL_ONLY && ((defined __GNUC__ && __GNUC__ > 4) || (defined __clang__ && __has_attribute(returns_nonnull))) +#if defined LIBO_INTERNAL_ONLY && ((defined __GNUC__ && !defined __clang__) || (defined __clang__ && __has_attribute(returns_nonnull))) #define SAL_RETURNS_NONNULL __attribute__((returns_nonnull)) #else #define SAL_RETURNS_NONNULL |