From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 17 Apr 2014 02:00:13 +0000 (-0400)
Subject: Only expose clean_backtrace() if we'll implement it
X-Git-Tag: tor-0.2.5.4-alpha~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=211b8cc31846e2d2ba75f19ab9f319f18cb70cfb;p=thirdparty%2Ftor.git

Only expose clean_backtrace() if we'll implement it

Fixes windows compilation; bug not in any released Tor.

Bugfix on cc9e86db.
---

diff --git a/src/common/backtrace.h b/src/common/backtrace.h
index b1df281659..1f4d73339f 100644
--- a/src/common/backtrace.h
+++ b/src/common/backtrace.h
@@ -11,8 +11,11 @@ int configure_backtrace_handler(const char *tor_version);
 void clean_up_backtrace_handler(void);
 
 #ifdef EXPOSE_CLEAN_BACKTRACE
+#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
+  defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)
 void clean_backtrace(void **stack, int depth, const ucontext_t *ctx);
 #endif
+#endif
 
 #endif