[tor-commits] [tor/master] Make header includes match declarations in pc_from_ucontext.m4

[nickm at torproject.org]

commit 93c99508d2440f4ff11df62315cf54f2acd932f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 18 11:34:15 2013 -0500

    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.
---
 src/common/backtrace.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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