strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Windows dllmgr-x64 also for aarch64

Browse source 
At least, CppunitTest_basic_macros CPPUNIT_TEST_NAME=Coverage::Coverage_Iterator
(which exercises it in basic/qa/basic_coverage/test_declare_from_dll.bas)
succeeds.

Change-Id: Ife90d5b84d5fb7bb4948cfeaf48180a6929a1dff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166695
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Tested-by: Jenkins
This commit is contained in:
Stephan Bergmann 2024-04-26 09:21:17 +02:00
parent 7437b842c4
commit 8d775b9259
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
basic/Library_sb.mk
View file

@ -150,7 +150,7 @@ $(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-x86 \
))
else
ifeq ($(OS)$(CPUNAME),WNTX86_64)
ifeq ($(OS)$(filter-out AARCH64 X86_64,$(CPUNAME)),WNT)
$(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x64 \
))

2
basic/source/runtime/dllmgr-none.cxx
View file

@ -106,7 +106,7 @@ void SbiDllMgr::FreeDll(SAL_UNUSED_PARAMETER OUString const &) {}
SbiDllMgr::SbiDllMgr() = default;
#if defined(_WIN32) && !defined(_ARM64_)
#if defined(_WIN32)
SbiDllMgr::~SbiDllMgr() = default;
#endif

4
basic/source/runtime/dllmgr.hxx
View file

@ -33,7 +33,7 @@ public:
SbiDllMgr();
#if defined(_WIN32) && !defined(_ARM64_)
#if defined(_WIN32)
~SbiDllMgr();
#endif
@ -44,7 +44,7 @@ public:
void FreeDll(OUString const & library);
private:
#if defined(_WIN32) && !defined(_ARM64_)
#if defined(_WIN32)
struct Impl;
std::unique_ptr< Impl > impl_;