From 4191419560dfa192f5987317edb9be406ebde26d Mon Sep 17 00:00:00 2001
From: Antony Polukhin <antoshkka@gmail.com>
Date: Sat, 25 Feb 2017 23:24:48 +0300
Subject: [PATCH] Fixing MinGW (3)

---
 build/has_addr2line.cpp       | 3 +++
 example/terminate_handler.cpp | 4 ++--
 test/test.cpp                 | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build/has_addr2line.cpp b/build/has_addr2line.cpp
index de4f69c..eddede4 100644
--- a/build/has_addr2line.cpp
+++ b/build/has_addr2line.cpp
@@ -7,6 +7,9 @@
 #include <cstdlib>
 #include <string>
 
+#include <sys/types.h>
+#include <sys/wait.h>
+
 int main() {
     std::string s = "addr2line -h";
     return std::system(s.c_str());
diff --git a/example/terminate_handler.cpp b/example/terminate_handler.cpp
index c9e146f..59db909 100644
--- a/example/terminate_handler.cpp
+++ b/example/terminate_handler.cpp
@@ -24,8 +24,8 @@ BOOST_NOINLINE void foo(int i) {
 #if defined(BOOST_GCC) && defined(BOOST_WINDOWS)
 
 // MinGW workaround
-#include <cstdlib>      // std::_Exit
-namespace std { using ::_Exit; };
+#include <cstdlib>      // ::_Exit
+namespace std { using ::_Exit; }
 
 #endif
 
diff --git a/test/test.cpp b/test/test.cpp
index ad5b4e7..1007bf1 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -85,14 +85,14 @@ void test_nested() {
 
     BOOST_TEST(ss1.str().find(" 1# ") != std::string::npos);
     BOOST_TEST(ss2.str().find(" 1# ") != std::string::npos);
-
-    BOOST_TEST(ss1.str().find("main") != std::string::npos);
-    BOOST_TEST(ss2.str().find("main") != std::string::npos);
     
     BOOST_TEST(ss1.str().find(" in ") != std::string::npos);
     BOOST_TEST(ss2.str().find(" in ") != std::string::npos);
 
 #if BOOST_STACKTRACE_SYMNAME
+    BOOST_TEST(ss1.str().find("main") != std::string::npos);
+    BOOST_TEST(ss2.str().find("main") != std::string::npos);
+
     BOOST_TEST(ss1.str().find("foo2") != std::string::npos);
     BOOST_TEST(ss2.str().find("foo2") != std::string::npos);