solenv/gbuild/platform/com_MSC_defs.mk | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit b988f64d37f1e46fb5a9449758b379fc01661fa2
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Wed Dec 12 17:48:52 2012 +0100
do not disable msvc warning 4005
And in fact make it an error with PCH, as there's it's very likely
a PCH-specific problem.
History refers to i76713 when introducing this, and that was something
about .NET 2005, so this quite likely no longer applies.
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index e8d2f29..bea9b91 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -74,8 +74,6 @@ gb_AFLAGS := /c /Cp
# cleaning away from the code, to avoid warnings when building with
# gcc or Clang and -Wall -Werror.
-# C4005: 'identifier' : macro redefinition
-
# C4127: conditional expression is constant
# C4180: qualifier applied to function type has no meaning; ignored
@@ -149,7 +147,6 @@ gb_CFLAGS := \
-MD \
-nologo \
-W4 \
- -wd4005 \
-wd4127 \
-wd4180 \
-wd4189 \
@@ -183,7 +180,6 @@ gb_CXXFLAGS := \
-MD \
-nologo \
-W4 \
- -wd4005 \
-wd4127 \
-wd4180 \
-wd4189 \
@@ -220,11 +216,14 @@ ifeq ($(VCVER),100)
endif
+# C4005: 'identifier' : macro redefinition
+
gb_PCHWARNINGS = \
-we4650 \
-we4651 \
-we4652 \
-we4653 \
+ -we4005 \
gb_STDLIBS := \
advapi32.lib \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
