[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - solenv/gbuild

[Thorsten Behrens (via logerrit)]

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

New commits:
commit 68bad2aaa61859d444cd9b722c77fc48c7d5a551
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Sat May 25 11:12:18 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat May 25 11:12:18 2019 +0200

    Disable warning C4005 for Vista-compatible SDK 7.1A builds
    
    No point in pulling in all warning fixes from 5.4
    
    Change-Id: I926b2b41628d7059ec9187918ac9df9c1160dfe6

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 424dad3686d9..30a3dbcafe65 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -152,6 +152,7 @@ gb_CFLAGS := \
 	-nologo \
 	-W4 \
 	-wd4091 \
+       -wd4005 \
 	$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4100) \
 	-wd4127 \
 	$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
@@ -194,6 +195,7 @@ gb_CXXFLAGS := \
 	-nologo \
 	-W4 \
 	-wd4091 \
+       -wd4005 \
 	$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4100) \
 	-wd4127 \
 	$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
@@ -259,7 +261,6 @@ gb_PCHWARNINGS = \
 	-we4651 \
 	-we4652 \
 	-we4653 \
-	-we4005 \
 
 gb_STDLIBS := \
 	advapi32.lib \