3 files changed, 2 insertions, 12 deletions
diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index 6f879965840c..ae28ca4b6570 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -112,7 +112,7 @@ template<typename T> inline bool checked_sub(T a, T b, T& result)
     return !msl::utilities::SafeSubtract(a, b, result);
 }
 
-#elif (defined __GNUC__ && __GNUC__ >= 5) || (__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined __clang__) && !(defined(__clang__) && defined(__i386__)))
+#elif (defined __GNUC__ && !defined __clang__) || (__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined __clang__) && !(defined(__clang__) && defined(__i386__)))
 // 32-bit clang fails with undefined reference to `__mulodi4'
 
 template<typename T> inline bool checked_multiply(T a, T b, T& result)
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index 7e9ff1cc86fd..6f3e18f9d202 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -229,12 +229,7 @@ struct ConstCharArrayDetector<sal_Unicode const [N], T> {
     { return literal; }
 };
 template<typename T> struct ConstCharArrayDetector<
-#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 8 \
-        && !defined __clang__
-    OUStringLiteral1_ const,
-#else
     OUStringLiteral1,
-#endif
     T>
 {
     using TypeUtf16 = T;
@@ -260,12 +255,7 @@ struct ExceptConstCharArrayDetector< const char[ N ] >
 template<std::size_t N>
 struct ExceptConstCharArrayDetector<sal_Unicode const[N]> {};
 template<> struct ExceptConstCharArrayDetector<
-#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 8 \
-        && !defined __clang__
-    OUStringLiteral1_ const
-#else
     OUStringLiteral1
-#endif
     >
 {};
 #endif
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