From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 18 Nov 2013 16:34:15 +0000 (-0500)
Subject: Make header includes match declarations in pc_from_ucontext.m4
X-Git-Tag: tor-0.2.5.2-alpha~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93c99508d2440f4ff11df62315cf54f2acd932f0;p=thirdparty%2Ftor.git

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.
---

diff --git a/src/common/backtrace.c b/src/common/backtrace.c
index 78bc66efbc..32e5362e8d 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) && \