summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-10-25 15:00:18 +0300
committerTor Lillqvist <tlillqvist@suse.com>2011-10-25 17:21:40 +0300
commit4f32f6f9903d90e884ebab954c60bad1a0a91e82 (patch)
treed3e76ab42acd0faecaf3e937dc6c890bfbe9bb1d /solenv
parent6047d5952dc119cd2de3f9b2d6c556e8bfd8fcac (diff)
WaE: ignore also MSVC warning C4706: assignment within conditional expression
Sad, but it's too tedious to refactor code like: while( (pLayout = GetLayout(pLayout)) ) { ... }
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/windows.mk2
-rw-r--r--solenv/inc/wntmsc.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index c22a1876c583..eee6bad992dc 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -122,6 +122,7 @@ gb_CFLAGS := \
-wd4668 \
-wd4675 \
-wd4692 \
+ -wd4706 \
-wd4710 \
-wd4711 \
-wd4373 \
@@ -175,6 +176,7 @@ gb_CXXFLAGS := \
-wd4668 \
-wd4675 \
-wd4692 \
+ -wd4706 \
-wd4710 \
-wd4711 \
-wd4373 \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 02e2d9166df3..3680ce980704 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -196,7 +196,7 @@ CFLAGSOUTOBJ=-Fo
CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 -wd4244 -wd4245 -wd4250 -wd4251 -wd4275 \
-wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4555 -wd4611 -wd4625 -wd4626 \
- -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
+ -wd4640 -wd4675 -wd4706 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
-wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
-wd4180
CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255