From: Eric Blake <eblake@redhat.com>
Date: Tue, 25 Jan 2011 22:14:14 +0000 (-0700)
Subject: c-stack: fix regression on cygwin when libsigsegv is present
X-Git-Tag: v0.1~3295
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=fe72585eca1333490f37041e88703df1ebe93eba;p=gnulib.git

c-stack: fix regression on cygwin when libsigsegv is present

* lib/c-stack.c (die): Don't flatten error if sigsegv is present.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index ab1ad1e7b..5f8c93ea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-25  Eric Blake  <eblake@redhat.com>
+
+	c-stack: fix regression on cygwin when libsigsegv is present
+	* lib/c-stack.c (die): Don't flatten error if sigsegv is present.
+
 2011-01-24  Bruno Haible  <bruno@clisp.org>
 
 	vma-iter: Avoid empty intervals.
diff --git a/lib/c-stack.c b/lib/c-stack.c
index bff346bd9..7f0f48845 100644
--- a/lib/c-stack.c
+++ b/lib/c-stack.c
@@ -109,12 +109,12 @@ static void
 die (int signo)
 {
   char const *message;
-#if !SIGINFO_WORKS
+#if !SIGINFO_WORKS && !HAVE_LIBSIGSEGV
   /* We can't easily determine whether it is a stack overflow; so
      assume that the rest of our program is perfect (!) and that
      this segmentation violation is a stack overflow.  */
   signo = 0;
-#endif /* !SIGINFO_WORKS */
+#endif /* !SIGINFO_WORKS && !HAVE_LIBSIGSEGV */
   segv_action (signo);
   message = signo ? program_error_message : stack_overflow_message;
   ignore_value (write (STDERR_FILENO, program_name, strlen (program_name)));