diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-30 08:52:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-30 08:57:49 +0100 |
| commit | 3cea15792452ea779e79c572e7287e2fe8ed9740 (patch) | |
| tree | 7dfcaa80c10dbaaee3eb3cfdc8f9cfbac33a471f | |
| parent | 27aa26a1953524304f75d8a7a58e87f67485d32c (diff) | |
Globally disable MSVC warning 4201 (nonstandard extension nameless struct)
...it is caused by some external code (newly so by glm included in chart2) and
does not really add value. (Incidentally, all relevent compilers, Clang, GCC,
and MSVC uniformly support this language extension anyway.)
Change-Id: I5b4c11b5cea0267bf39ac95e9021a5761a4d7b91
| -rw-r--r-- | external/np_sdk/inc/npapi.h | 7 | ||||
| -rw-r--r-- | include/vcl/sysdata.hxx | 7 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 3 |
3 files changed, 3 insertions, 14 deletions
diff --git a/external/np_sdk/inc/npapi.h b/external/np_sdk/inc/npapi.h index e554d2a985a4..d6b1c5986bdf 100644 --- a/external/np_sdk/inc/npapi.h +++ b/external/np_sdk/inc/npapi.h @@ -51,14 +51,7 @@ #endif #if defined(_WIN32) && !defined(__SYMBIAN32__) -#if defined _MSC_VER && _MSC_VER >= 1200 -#pragma warning(push) -#pragma warning(disable:4201) -#endif #include <windef.h> -#if defined _MSC_VER && _MSC_VER >= 1200 -#pragma warning(pop) -#endif #ifndef XP_WIN #define XP_WIN 1 #endif diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index af65ce68df4a..2328cbe49f35 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -41,14 +41,7 @@ typedef struct CGContext *CGContextRef; #endif #if defined( WNT ) -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4201) -#endif #include <windef.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #endif struct SystemEnvData diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index dbe3c22c0b14..f339609b8de0 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -72,6 +72,8 @@ gb_AFLAGS := $(AFLAGS) # C4189: 'identifier' : local variable is initialized but not referenced +# C4201: nonstandard extension used : nameless struct/union + # C4242: 'identifier' : conversion from 'type1' to 'type2', possible # loss of data @@ -163,6 +165,7 @@ gb_CXXFLAGS := \ -W4 \ -wd4127 \ -wd4189 \ + -wd4201 \ -wd4244 \ -wd4245 \ -wd4250 \ |