diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-21 17:00:15 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-21 17:01:29 +0300 |
| commit | 4fabf8446c00f7e9094196d73fad13bdb2d571ec (patch) | |
| tree | d31b82fcdd167e1c0a0939696a77ec874fc7a14a /indra/llcommon/llstacktrace.cpp | |
| parent | 94eea485edf06c48fcbbbf195ee2f8eb9b8616b1 (diff) | |
| parent | 72423372d6cd7f763a5567ad75752fa4e7131d60 (diff) | |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/llcommon/llstacktrace.cpp')
| -rw-r--r-- | indra/llcommon/llstacktrace.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llstacktrace.cpp b/indra/llcommon/llstacktrace.cpp index bbf0e1e141..80057bf0f2 100644 --- a/indra/llcommon/llstacktrace.cpp +++ b/indra/llcommon/llstacktrace.cpp @@ -33,7 +33,10 @@ #include <sstream> #include "llwin32headerslean.h" -#include "Dbghelp.h" +#pragma warning (push) +#pragma warning (disable:4091) // a microsoft header has warnings. Very nice. +#include <dbghelp.h> +#pragma warning (pop) typedef USHORT NTAPI RtlCaptureStackBackTrace_Function( IN ULONG frames_to_skip, |