diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-12-11 16:36:08 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 19:24:25 -0400 |
| commit | 79f3bda1a5570041d0db4d12c8bdb7482d194437 (patch) | |
| tree | d5337aa97ddef34c1da0a24d97279376aa4d835f /indra/llcommon | |
| parent | 557a74fbddac609ce238a7bbafc3138b95956575 (diff) | |
DRTVWR-476: On Windows, use prebuilt Boost.Stacktrace.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llexception.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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" |