From d1380eba2875b20444b8faea77fb269a01bbfec5 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Sat, 18 Mar 2017 16:50:38 +0300 Subject: [PATCH] Apply Cygwin fixes from Peter Dimov --- include/boost/stacktrace/detail/frame_unwind.ipp | 2 +- include/boost/stacktrace/detail/location_from_symbol.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/stacktrace/detail/frame_unwind.ipp b/include/boost/stacktrace/detail/frame_unwind.ipp index 8cb8e2a..37b7a7e 100644 --- a/include/boost/stacktrace/detail/frame_unwind.ipp +++ b/include/boost/stacktrace/detail/frame_unwind.ipp @@ -130,7 +130,7 @@ std::string to_string(const frame* frames, std::size_t size) { std::string frame::name() const { -#ifndef BOOST_WINDOWS +#if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__) ::Dl_info dli; const bool dl_ok = !!::dladdr(addr_, &dli); if (dl_ok && dli.dli_sname) { diff --git a/include/boost/stacktrace/detail/location_from_symbol.hpp b/include/boost/stacktrace/detail/location_from_symbol.hpp index 7faf26a..d20b0d6 100644 --- a/include/boost/stacktrace/detail/location_from_symbol.hpp +++ b/include/boost/stacktrace/detail/location_from_symbol.hpp @@ -12,7 +12,7 @@ # pragma once #endif -#ifndef BOOST_WINDOWS +#if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__) # include #else # include @@ -21,7 +21,7 @@ namespace boost { namespace stacktrace { namespace detail { class location_from_symbol { -#ifndef BOOST_WINDOWS +#if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__) ::Dl_info dli_; public: