merged fix from RC_0_16

2013-05-26 21:36:20 +00:00
parent 5fff90b288
commit ad8c105a24
2 changed files with 13 additions and 2 deletions
--- a/src/assert.cpp
+++ b/src/assert.cpp
@@ -114,8 +114,7 @@ std::string demangle(char const* name) { return name; }
 #include <signal.h>
 #include "libtorrent/version.hpp"

-// execinfo.h is available in the MacOS X 10.5 SDK.
-#if (defined __linux__ || (defined __APPLE__ && MAC_OS_X_VERSION_MIN_REQUIRED >= 1050))
+#if TORRENT_USE_EXECINFO
 #include <execinfo.h>

 TORRENT_EXPORT void print_backtrace(char* out, int len, int max_depth)