From b09770946a8ae3396517c6796d1bff2a1707de26 Mon Sep 17 00:00:00 2001 From: Anchor Date: Wed, 15 May 2019 03:57:10 -0600 Subject: [DRTVWR-476] - disable dbghelp.h warnings --- indra/llcommon/StackWalker.cpp | 3 +++ indra/newview/llwindebug.h | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'indra') diff --git a/indra/llcommon/StackWalker.cpp b/indra/llcommon/StackWalker.cpp index d34ad9a369..7a7230db4b 100644 --- a/indra/llcommon/StackWalker.cpp +++ b/indra/llcommon/StackWalker.cpp @@ -98,7 +98,10 @@ // If VC7 and later, then use the shipped 'dbghelp.h'-file #pragma pack(push,8) #if _MSC_VER >= 1300 +#pragma warning (push) +#pragma warning (disable:4091) // a microsoft header has warnings. Very nice. #include +#pragma warning (pop) #else // inline the important dbghelp.h-declarations... typedef enum { diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h index 7e5818ba1c..05f245b311 100644 --- a/indra/newview/llwindebug.h +++ b/indra/newview/llwindebug.h @@ -29,7 +29,11 @@ #include "stdtypes.h" #include "llwin32headerslean.h" + +#pragma warning (push) +#pragma warning (disable:4091) // a microsoft header has warnings. Very nice. #include +#pragma warning (pop) class LLWinDebug: public LLSingleton -- cgit v1.2.3