solenv/gbuild/platform/com_MSC_class.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 15735e42d401453dc188910f9c043bbfab94955a
Author:     Mike Kaganski <[email protected]>
AuthorDate: Sun Jan 11 21:00:00 2026 +0100
Commit:     Mike Kaganski <[email protected]>
CommitDate: Mon Jan 12 06:11:52 2026 +0100

    Silence warning D9025 : overriding '/D_DLL' with '/U_DLL'
    
    -U_DLL is used in setup_native and external/onlineupdate.
    
    Change-Id: I4c2e6f1b35f3a3597e8b641e72f8f6f8b146706d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197050
    Reviewed-by: Mike Kaganski <[email protected]>
    Tested-by: Jenkins

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index b63516175c15..2904dec031d6 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -40,7 +40,7 @@ endef
 gb_Helper_remove_overridden_flags = \
     $(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2 
-Zc:inline -Zc:inline- \
         -Zc:dllexportInlines -Zc:dllexportInlines- -EHs -EHa -DNOMINMAX 
-UNOMINMAX -D_X86_=1 -U_X86_ \
-        -D_AMD64_=1 -U_AMD64_ $(MSVC_ANALYZE_FLAGS) -analyze-,$(1)) \
+        -D_AMD64_=1 -U_AMD64_ -D_DLL -U_DLL $(MSVC_ANALYZE_FLAGS) 
-analyze-,$(1)) \
     $(lastword $(filter -W4 -w,$(1))) \
     $(lastword $(filter -Od -O2,$(1))) \
     $(lastword $(filter -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2,$(1))) \
@@ -48,6 +48,7 @@ gb_Helper_remove_overridden_flags = \
     $(lastword $(filter -DNOMINMAX -UNOMINMAX,$(1))) \
     $(lastword $(filter -D_X86_=1 -U_X86_,$(1))) \
     $(lastword $(filter -D_AMD64_=1 -U_AMD64_,$(1))) \
+    $(lastword $(filter -D_DLL -U_DLL,$(1))) \
     $(lastword $(filter -Zc:inline -Zc:inline-,$(1))) \
     $(lastword $(filter -Zc:dllexportInlines -Zc:dllexportInlines-,$(1))) \
     $(lastword $(filter $(MSVC_ANALYZE_FLAGS) -analyze-,$(1)))

Reply via email to