diff options
| author | nijtmans <nijtmans> | 2010-07-25 10:13:48 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-07-25 10:13:48 (GMT) |
| commit | 5cbb5a46c8f2983cc68798d12d55b96cf0f1ec4f (patch) | |
| tree | 5877e6c210b5cca0cbbe807c7dbd2cdfde51dc11 | |
| parent | 201dbba4ce2f18849d8bdcbcd30772661ff2edb8 (diff) | |
| download | tcl-5cbb5a46c8f2983cc68798d12d55b96cf0f1ec4f.zip tcl-5cbb5a46c8f2983cc68798d12d55b96cf0f1ec4f.tar.gz tcl-5cbb5a46c8f2983cc68798d12d55b96cf0f1ec4f.tar.bz2 | |
[Bug 3030870] make itcl 3.x built with pre-8.6 work in 8.6:
revert tclInt.h to what it was before, and relax the relation between Tcl_CallFrame and CallFrame.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tclBasic.c | 6 | ||||
| -rw-r--r-- | generic/tclInt.h | 3 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2010-07-25 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tclInt.h [Bug 3030870] make itcl 3.x built with pre-8.6 work in 8.6 + * generic/tclBasic.c revert tclInt.h to what it was before, and relax the relation + between Tcl_CallFrame and CallFrame. + 2010-07-17 Jan Nijtmans <nijtmans@users.sf.net> * generic/tcl.h [Bug 3030870] make itcl 3.x built with pre-8.6 work in 8.6 diff --git a/generic/tclBasic.c b/generic/tclBasic.c index cf38893..0c57652 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.295.2.17 2010/02/21 20:27:49 nijtmans Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.295.2.18 2010/07/25 10:13:49 nijtmans Exp $ */ #include "tclInt.h" @@ -407,9 +407,9 @@ Tcl_CreateInterp(void) * the Tcl_CallFrame structure (or vice versa). */ - if (sizeof(Tcl_CallFrame) != sizeof(CallFrame)) { + if (sizeof(Tcl_CallFrame) < sizeof(CallFrame)) { /*NOTREACHED*/ - Tcl_Panic("Tcl_CallFrame and CallFrame are not the same size"); + Tcl_Panic("Tcl_CallFrame must not be smaller than CallFrame"); } /* diff --git a/generic/tclInt.h b/generic/tclInt.h index 8efd344..eb88ef0 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInt.h,v 1.362.2.13 2010/07/17 07:42:44 nijtmans Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.362.2.14 2010/07/25 10:13:48 nijtmans Exp $ */ #ifndef _TCLINT @@ -1041,7 +1041,6 @@ typedef struct CallFrame { * meaning of the value is, which we do not * specify. */ LocalCache *localCachePtr; - VOID *dummy13; } CallFrame; #define FRAME_IS_PROC 0x1 |