From c07c94e4875e321f4f2503e0ba8c816d7f32b5f7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 26 Oct 2011 14:59:17 +0300 Subject: [PATCH] WaE: possible change in behavior, change in UDT return calling convention Ignore also MSVC warning C4686. From http://msdn.microsoft.com/en-us/library/ae77984s%28v=VS.90%29.aspx it seems that this is just a warning that the compiler behaviour has changed, but that change was already in MSVC 2003. So it should be irrelevant to us. --- solenv/gbuild/platform/windows.mk | 2 ++ solenv/inc/wntmsc.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index eee6bad992dc..896eb0db8cd1 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -121,6 +121,7 @@ gb_CFLAGS := \ -wd4640 \ -wd4668 \ -wd4675 \ + -wd4686 \ -wd4692 \ -wd4706 \ -wd4710 \ @@ -175,6 +176,7 @@ gb_CXXFLAGS := \ -wd4640 \ -wd4668 \ -wd4675 \ + -wd4686 \ -wd4692 \ -wd4706 \ -wd4710 \ diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index 3680ce980704..3c4bbf8619aa 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 -wd4706 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \ + -wd4640 -wd4675 -wd4686 -wd4706 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \ -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \ -wd4180 CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255