sw/source/core/txtnode/modeltoviewhelper.cxx | 4 ++--
vcl/unx/generic/fontmanager/fontconfig.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4f37c51e9de14a04365c35f7ec7a4ac256995a51
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Aug 4 09:01:06 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Aug 4 12:01:42 2022 +0200
Fix typos, __clang_ -> __clang__
Change-Id: I89b8a2cb778f91610b6a8e8efc0c4e6ed96a7644
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137778
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx
b/sw/source/core/txtnode/modeltoviewhelper.cxx
index aed37ce19174..78a582866fa0 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -179,14 +179,14 @@ ModelToViewHelper::ModelToViewHelper(const SwTextNode
&rNode,
[](auto const& it) { return it.second; }))
{
// prevent -Werror=maybe-uninitialized under gcc 11.2.0
-#if defined __GNUC__ && !defined __clang_ && __GNUC__ >= 11 && __GNUC__ <= 12
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 11 && __GNUC__ <= 12
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
// i is still hidden but the Range end is oddly "-1"
aHiddenMulti.Select({*oStartHidden, i}, true);
oStartHidden.reset();
-#if defined __GNUC__ && !defined __clang_ && __GNUC__ >= 11 && __GNUC__ <= 12
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 11 && __GNUC__ <= 12
#pragma GCC diagnostic pop
#endif
}
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index f259277304d0..24ff67b4b893 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined __GNUC__ && !defined __clang_ && __GNUC__ == 10
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 10
// gcc 10.2.0 gets unhappy about one of the OString inside PrintFont at line
656 (while at least a
// recent GCC 12 trunk is happy);
// I have to turn it off here because the warning actually occurs inside
rtl::OString
