summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-10-21 13:58:47 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-10-21 13:58:47 (GMT)
commite6bbad298d8df84ba97e6f019d01c1956165c915 (patch)
tree83e61844bf8b67259d1f8c8603d70c702197e46e
parentb71e44a2958f126a3de29dd3641cfbc259cff627 (diff)
downloadtcl-e6bbad298d8df84ba97e6f019d01c1956165c915.zip
tcl-e6bbad298d8df84ba97e6f019d01c1956165c915.tar.gz
tcl-e6bbad298d8df84ba97e6f019d01c1956165c915.tar.bz2
Fix [Bug 2882561].
-rw-r--r--ChangeLog27
-rw-r--r--generic/tclPosixStr.c6
2 files changed, 19 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f7f32f..b788e78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-21 Donal K. Fellows <dkf@users.sf.net>
+
+ * generic/tclPosixStr.c: [Bug 2882561]: Work around oddity on Haiku OS
+ where SIGSEGV and SIGBUS are the same value.
+
2009-10-18 Joe Mistachkin <joe@mistachkin.com>
* tests/thread.test (thread-4.[345]): [Bug 1565466]: Correct tests to
@@ -28,18 +33,18 @@
2009-08-25 Andreas Kupries <andreask@activestate.com>
* generic/tclBasic.c (Tcl_CreateInterp, Tcl_EvalTokensStandard,
- EvalTokensStandard, Tcl_EvalEx, EvalEx, TclAdvanceContinuations,
- TclEvalObjEx):
+ (EvalTokensStandard, Tcl_EvalEx, EvalEx, TclAdvanceContinuations,
+ (TclEvalObjEx):
* generic/tclCmdMZ.c (Tcl_SwitchObjCmd, ListLines):
* generic/tclCompCmds.c (*):
* generic/tclCompile.c (TclSetByteCodeFromAny, TclInitCompileEnv,
- TclFreeCompileEnv, TclCompileScript):
+ (TclFreeCompileEnv, TclCompileScript):
* generic/tclCompile.h (CompileEnv):
* generic/tclInt.h (ContLineLoc, Interp):
* generic/tclObj.c (ThreadSpecificData, ContLineLocFree,
- TclThreadFinalizeObjects, TclInitObjSubsystem,
- TclContinuationsEnter, TclContinuationsEnterDerived,
- TclContinuationsCopy, TclContinuationsGet, TclFreeObj):
+ (TclThreadFinalizeObjects, TclInitObjSubsystem,
+ (TclContinuationsEnter, TclContinuationsEnterDerived,
+ (TclContinuationsCopy, TclContinuationsGet, TclFreeObj):
* generic/tclProc.c (TclCreateProc):
* generic/tclVar.c (TclPtrSetVar):
* tests/info.test (info-30.0-22):
@@ -61,9 +66,9 @@
2009-07-14 Andreas Kupries <andreask@activestate.com>
* generic/tclBasic.c (DeleteInterpProc,TclArgumentBCEnter,
- TclArgumentBCRelease, TclArgumentGet):
+ (TclArgumentBCRelease, TclArgumentGet):
* generic/tclCompile.c (EnterCmdWordIndex, TclCleanupByteCode,
- TclInitCompileEnv, TclCompileScript):
+ (TclInitCompileEnv, TclCompileScript):
* generic/tclCompile.h (ExtCmdLoc):
* generic/tclExecute.c (TclExecuteByteCode):
* generic/tclInt.h (ExtIndex, CFWordBC):
@@ -102,8 +107,8 @@
2009-04-27 Alexandre Ferrieux <ferrieux@users.sourceforge.net>
- * generic/tclInt.h: Backport fix for [Bug 1028264]: WSACleanup() too early.
- * generic/tclEvent.c: The fix introduces "late exit handlers"
+ * generic/tclInt.h: Backport fix for [Bug 1028264]: WSACleanup() too
+ * generic/tclEvent.c: early. The fix introduces "late exit handlers"
* win/tclWinSock.c: for similar late process-wide cleanups.
2009-04-27 Alexandre Ferrieux <ferrieux@users.sourceforge.net>
@@ -114,7 +119,7 @@
2009-04-22 Andreas Kupries <andreask@activestate.com>
* generic/tclStringObj.c (UpdateStringOfString): Added cast to fix
- signed/unsigned mismatch breaking win32 symbol/debug build.
+ signed/unsigned mismatch breaking win32 symbol/debug build.
2009-04-15 Don Porter <dgp@users.sourceforge.net>
diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
index cc2a546..3b3467d 100644
--- a/generic/tclPosixStr.c
+++ b/generic/tclPosixStr.c
@@ -11,7 +11,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.9 2002/05/27 10:14:21 dkf Exp $
+ * RCS: @(#) $Id: tclPosixStr.c,v 1.9.2.1 2009/10/21 13:58:48 dkf Exp $
*/
#include "tclInt.h"
@@ -998,7 +998,7 @@ Tcl_SignalId(sig)
#ifdef SIGQUIT
case SIGQUIT: return "SIGQUIT";
#endif
-#ifdef SIGSEGV
+#if defined(SIGSEGV) && (!defined(SIGBUS) || (SIGSEGV != SIGBUS))
case SIGSEGV: return "SIGSEGV";
#endif
#ifdef SIGSTOP
@@ -1130,7 +1130,7 @@ Tcl_SignalMsg(sig)
#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