From 0090777f347570cac9c9882f3cabd92b2be323f8 Mon Sep 17 00:00:00 2001
From: John Jones <jmjatlanta@gmail.com>
Date: Fri, 9 Nov 2018 14:44:41 -0500
Subject: [PATCH 1/3] boost stacktrace does not play well with mac

---
 src/stacktrace.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stacktrace.cpp b/src/stacktrace.cpp
index 0e00044..6ccd8cc 100644
--- a/src/stacktrace.cpp
+++ b/src/stacktrace.cpp
@@ -5,7 +5,7 @@
 #include <boost/version.hpp>
 
 // only include stacktrace stuff if boost >= 1.65
-#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65
+#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65 && !defined(__APPLE__)
 #include <signal.h>
 #include <fc/log/logger.hpp>
 #include <boost/stacktrace.hpp>

From 5c0ee5d6b7ce8956cc97e78c93dddb19fcd05322 Mon Sep 17 00:00:00 2001
From: John Jones <jmjatlanta@gmail.com>
Date: Mon, 12 Nov 2018 20:57:58 -0500
Subject: [PATCH 2/3] clarify comment

---
 src/stacktrace.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stacktrace.cpp b/src/stacktrace.cpp
index 6ccd8cc..7abc606 100644
--- a/src/stacktrace.cpp
+++ b/src/stacktrace.cpp
@@ -4,7 +4,7 @@
 #include <ostream>
 #include <boost/version.hpp>
 
-// only include stacktrace stuff if boost >= 1.65
+// only include stacktrace stuff if boost >= 1.65 and not macOS
 #if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65 && !defined(__APPLE__)
 #include <signal.h>
 #include <fc/log/logger.hpp>

From fd345e5bc2196656bfa11c70c9a66517373692a1 Mon Sep 17 00:00:00 2001
From: John Jones <jmjatlanta@gmail.com>
Date: Tue, 13 Nov 2018 16:06:59 -0500
Subject: [PATCH 3/3] fix #if for boost versions > 2

---
 src/stacktrace.cpp        | 2 +-
 tests/stacktrace_test.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/stacktrace.cpp b/src/stacktrace.cpp
index 7abc606..126691f 100644
--- a/src/stacktrace.cpp
+++ b/src/stacktrace.cpp
@@ -5,7 +5,7 @@
 #include <boost/version.hpp>
 
 // only include stacktrace stuff if boost >= 1.65 and not macOS
-#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65 && !defined(__APPLE__)
+#if BOOST_VERSION / 100 >= 1065 && !defined(__APPLE__)
 #include <signal.h>
 #include <fc/log/logger.hpp>
 #include <boost/stacktrace.hpp>
diff --git a/tests/stacktrace_test.cpp b/tests/stacktrace_test.cpp
index bc710a5..098d732 100644
--- a/tests/stacktrace_test.cpp
+++ b/tests/stacktrace_test.cpp
@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE(stacktrace_test)
    std::stringstream ss;
    fc::print_stacktrace(ss);
    std::string results = ss.str();
-#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65
+#if BOOST_VERSION / 100 >= 1065 && !defined(__APPLE__)
    BOOST_CHECK(!results.empty());
    BOOST_CHECK(results.find("fc::print_stacktrace") != std::string::npos);
 #else
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(threaded_stacktrace_test)
                return ss.str();
             }
          ).wait();
-#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65
+#if BOOST_VERSION / 100 >= 1065 && !defined(__APPLE__)
    BOOST_CHECK(!results.empty());
    BOOST_CHECK(results.find("fc::print_stacktrace") != std::string::npos);
 #else
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(threaded_stacktrace_test)
 #endif
 }
 
-#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65
+#if BOOST_VERSION / 100 >= 1065 && !defined(__APPLE__)
 class _svdt_visitor
 {
 public: