aboutsummaryrefslogtreecommitdiff
path: root/src/common/backtrace.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-11-18 11:34:15 -0500
committerNick Mathewson <nickm@torproject.org>2013-11-18 11:34:15 -0500
commit93c99508d2440f4ff11df62315cf54f2acd932f0 (patch)
tree0ea465bbb94584556756327e238a3f3a7e876ec3 /src/common/backtrace.c
parentadf2fa9b4954c584ee381cb94d9c0c81d2c22fec (diff)
downloadtor-93c99508d2440f4ff11df62315cf54f2acd932f0.tar
tor-93c99508d2440f4ff11df62315cf54f2acd932f0.tar.gz
Make header includes match declarations in pc_from_ucontext.m4
With any luck, this will clean up errors where we detect that REG_{EIP,RIP} is present in autoconf, but when we go to include it, it isn't there.
Diffstat (limited to 'src/common/backtrace.c')
-rw-r--r--src/common/backtrace.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/common/backtrace.c b/src/common/backtrace.c
index 78bc66efb..32e5362e8 100644
--- a/src/common/backtrace.c
+++ b/src/common/backtrace.c
@@ -21,11 +21,13 @@
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
-#ifdef HAVE_UCONTEXT_H
-#include <ucontext.h>
-#endif
-#ifdef HAVE_SYS_UCONTEXT_H
+
+#ifdef HAVE_CYGWIN_SIGNAL_H
+#include <cygwin/signal.h>
+#elif HAVE_SYS_UCONTEXT_H
#include <sys/ucontext.h>
+#elif defined(HAVE_UCONTEXT_H)
+#include <ucontext.h>
#endif
#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \