From 234f7ff6e117e851acdcce448ef11d566a830f67 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 29 Jan 2016 22:35:17 +0100 Subject: [PATCH] Suppress harmless warning in a standard header with VC14 imagehlp.h from 8.1 SDK contains an extraneous "typedef" in an enum declaration which results in several warnings when building, avoid them. (cherry picked from commit fbe7fc85b27e64f8c059da4a01c16dfb4db483e4) --- include/wx/msw/debughlp.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/wx/msw/debughlp.h b/include/wx/msw/debughlp.h index 715814d0ae..d0d289e6a1 100644 --- a/include/wx/msw/debughlp.h +++ b/include/wx/msw/debughlp.h @@ -15,7 +15,20 @@ #include "wx/msw/wrapwin.h" #ifndef __WXWINCE__ +#ifdef __VISUALC__ + // Disable a warning that we can do nothing about: we get it at least for + // imagehlp.h from 8.1 Windows kit when using VC14. + #pragma warning(push) + + // 'typedef ': ignored on left of '' when no variable is declared + #pragma warning(disable:4091) +#endif + #include + +#ifdef __VISUALC__ + #pragma warning(pop) +#endif #endif // __WXWINCE__ #include "wx/msw/private.h"