jurt/source/pipe/staticsalhack.cxx | 3 +--
solenv/clang-format/excludelist | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit dd6e0ab30a120512e39f0d9b2e422243deae7b5f
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 13:03:56 2020 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Nov 13 08:20:50 2020 +0100
tdf#123936 Formatting files in module jurt with clang-format
Change-Id: I66fdaa39bb6f91fd04f01a39f3af0de6941b0070
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105683
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/jurt/source/pipe/staticsalhack.cxx
b/jurt/source/pipe/staticsalhack.cxx
index 2bcc53e85e9a..1f77ee9cba6e 100644
--- a/jurt/source/pipe/staticsalhack.cxx
+++ b/jurt/source/pipe/staticsalhack.cxx
@@ -70,8 +70,7 @@
// defined for ANDROID (in ANDROID-specific sal/textenc/tables.cxx); would even
// work to leave it undefined for LINUX due to no '-z defs' under -fsanitize=*
// (solenv/gbuild/platform/linux.mk), but not for MACOSX:
-extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData(
- rtl_TextEncoding)
+extern "C" ImplTextEncodingData const*
sal_getFullTextEncodingData(rtl_TextEncoding)
{
std::abort();
}
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 881753235abc..78ce6e8527d8 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7409,7 +7409,6 @@ javaunohelper/source/preload.cxx
javaunohelper/source/vm.cxx
javaunohelper/source/vm.hxx
jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
-jurt/source/pipe/staticsalhack.cxx
jurt/source/pipe/wrapper/wrapper.c
jvmaccess/source/classpath.cxx
jvmaccess/source/unovirtualmachine.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
