This is an automated email from the ASF dual-hosted git repository. damjan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4844d3187f12525fde5412697535cc41b660b063 Author: Damjan Jovanovic <[email protected]> AuthorDate: Wed Jan 1 07:50:17 2025 +0200 Do not use BOOST_MEM_FN_ENABLE_CDECL on the Windows/x64 build. It leads to duplicate function/method definition errors, as "cdecl" is a no-op on that architecture. The same change for gbuild was made in 01ab31f5a3a2bbdde6d18c11032f81ac95e0b077. Patch by: me --- main/solenv/inc/wntmscx.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/main/solenv/inc/wntmscx.mk b/main/solenv/inc/wntmscx.mk index 81c2be56cc..c6f33c9034 100644 --- a/main/solenv/inc/wntmscx.mk +++ b/main/solenv/inc/wntmscx.mk @@ -124,8 +124,11 @@ RSCDEFS+=-DFULL_DESK CFLAGSEXCEPTIONS=-EHa CFLAGS_NO_EXCEPTIONS= -# enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods -CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL +# boost support for __cdecl (SAL_CALL) C++-UNO interface methods +# would normally be necessary, but on Windows/x64 that produces +# errors, as cdecl is a no-op, so it produces duplicate functions/methods +# that fail to compile. So NEVER EVER EVER set this flag: +### CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL # with the current debug switches PCH won't work # anyway. so keep the existing .pch intact and don't
