From 79f3bda1a5570041d0db4d12c8bdb7482d194437 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 11 Dec 2019 16:36:08 -0500
Subject: DRTVWR-476: On Windows, use prebuilt Boost.Stacktrace.

---
 indra/llcommon/llexception.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra')

diff --git a/indra/llcommon/llexception.cpp b/indra/llcommon/llexception.cpp
index c0483e8927..5ce8958687 100644
--- a/indra/llcommon/llexception.cpp
+++ b/indra/llcommon/llexception.cpp
@@ -24,6 +24,11 @@
 // `_GNU_SOURCE` macro or `BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED` if
 // _Unwind_Backtrace is available without `_GNU_SOURCE`."
 #define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
+#if LL_WINDOWS
+// On Windows, header-only implementation causes macro collisions -- use
+// prebuilt library
+#define BOOST_STACKTRACE_LINK
+#endif // LL_WINDOWS
 #include <boost/stacktrace.hpp>
 // other Linden headers
 #include "llerror.h"
-- 
cgit v1.2.3