From a49cd1cebde3853aca839dc6dc0df7845585480f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 30 Nov 2021 18:34:09 +0100 Subject: [PATCH] fix clang-cl build with -Zc:dllexportInlines- MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This hack causes undefined references to those dllimport symbols, and it doesn't seem to be necessary for clang-cl (I've checked both normal and mergelibs build with -Zc:dllexportInlines-). Change-Id: Iaa336989507344442b59cec2e6c5078f91a42980 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126149 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- include/basic/modsizeexceeded.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx index 7403b398e777..8910be30b767 100644 --- a/include/basic/modsizeexceeded.hxx +++ b/include/basic/modsizeexceeded.hxx @@ -28,7 +28,7 @@ namespace com::sun::star::task { class XInteractionContinuation; } -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) // MSVC automatically applies dllexport to template instantiations if they are a base class // of a dllexport class, and this template instantiation is a case of that. If we don't // dllimport here, MSVC will complain about duplicate symbols in a mergelibs build.