[tor-commits] [tor/master] Only expose clean_backtrace() if we'll implement it

nickm at torproject.org nickm at torproject.org
Thu Apr 17 02:00:53 UTC 2014


commit 211b8cc31846e2d2ba75f19ab9f319f18cb70cfb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 16 22:00:13 2014 -0400

    Only expose clean_backtrace() if we'll implement it
    
    Fixes windows compilation; bug not in any released Tor.
    
    Bugfix on cc9e86db.
---
 src/common/backtrace.h |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/common/backtrace.h b/src/common/backtrace.h
index b1df281..1f4d733 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
 



More information about the tor-commits mailing list