From fdcd9d45ff7ee98fcf1fb2b950963234e42abf54 Mon Sep 17 00:00:00 2001 From: dkf Date: Wed, 21 Oct 2009 13:54:45 +0000 Subject: Fix [Bug 2882561]. --- ChangeLog | 5 +++++ generic/tclPosixStr.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 609b273..0eec538 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-21 Donal K. Fellows + + * generic/tclPosixStr.c: [Bug 2882561]: Work around oddity on Haiku OS + where SIGSEGV and SIGBUS are the same value. + 2009-10-19 Don Porter * generic/tclIO.c: Revised ReadChars and FilterInputBytes routines diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c index 31fccba..f8c410c 100644 --- a/generic/tclPosixStr.c +++ b/generic/tclPosixStr.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclPosixStr.c,v 1.12.10.1 2009/03/15 15:38:19 dkf Exp $ + * RCS: @(#) $Id: tclPosixStr.c,v 1.12.10.2 2009/10/21 13:54:45 dkf Exp $ */ #include "tclInt.h" @@ -994,7 +994,7 @@ Tcl_SignalId( #ifdef SIGQUIT case SIGQUIT: return "SIGQUIT"; #endif -#ifdef SIGSEGV +#if defined(SIGSEGV) && (!defined(SIGBUS) || (SIGSEGV != SIGBUS)) case SIGSEGV: return "SIGSEGV"; #endif #ifdef SIGSTOP @@ -1128,7 +1128,7 @@ Tcl_SignalMsg( #ifdef SIGQUIT case SIGQUIT: return "quit signal"; #endif -#ifdef SIGSEGV +#if defined(SIGSEGV) && (!defined(SIGBUS) || (SIGSEGV != SIGBUS)) case SIGSEGV: return "segmentation violation"; #endif #ifdef SIGSTOP -- cgit v0.12