From b09770946a8ae3396517c6796d1bff2a1707de26 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Wed, 15 May 2019 03:57:10 -0600
Subject: [PATCH] [DRTVWR-476] - disable dbghelp.h warnings
---
autobuild.xml | 2 +-
build.sh | 1 -
indra/llcommon/StackWalker.cpp | 3 +++
indra/newview/llwindebug.h | 4 ++++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 8afc8db46bf..a9525e6bbc5 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3755,7 +3755,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>windows</key>
<map>
<key>build_directory</key>
- <string>build-vc${AUTOBUILD_VSVER|120}-$AUTOBUILD_ADDRSIZE</string>
+ <string>build-vc${AUTOBUILD_VSVER|150}-$AUTOBUILD_ADDRSIZE</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>
diff --git a/build.sh b/build.sh
index bafee86206d..545c913f92c 100755
--- a/build.sh
+++ b/build.sh
@@ -140,7 +140,6 @@ pre_build()
"$autobuild" configure --quiet -c $variant -- \
-DPACKAGE:BOOL=ON \
-DHAVOK:BOOL="$HAVOK" \
- -DCMAKE_SYSTEM_VERSION:STRING="10.0" \
-DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
-DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" \
-DBUGSPLAT_DB:STRING="${BUGSPLAT_DB:-}" \
diff --git a/indra/llcommon/StackWalker.cpp b/indra/llcommon/StackWalker.cpp
index d34ad9a3695..7a7230db4b7 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 <dbghelp.h>
+#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 7e5818ba1c1..05f245b3114 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 <dbghelp.h>
+#pragma warning (pop)
class LLWinDebug:
public LLSingleton<LLWinDebug>
--
GitLab