diff options
| author | nijtmans <nijtmans> | 2010-07-25 10:15:08 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-07-25 10:15:08 (GMT) |
| commit | 56d46328e2d43b83bfc1ba4686263df989d47958 (patch) | |
| tree | 97bbb9bf438e2e62aaac6bca096670b00d861a4a | |
| parent | f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485 (diff) | |
| download | tcl-56d46328e2d43b83bfc1ba4686263df989d47958.zip tcl-56d46328e2d43b83bfc1ba4686263df989d47958.tar.gz tcl-56d46328e2d43b83bfc1ba4686263df989d47958.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 | 5 |
3 files changed, 10 insertions, 7 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-18 Jan Nijtmans <nijtmans@users.sf.net> * generic/tcl.h [Bug 3031278] fixed merge problem in previous commit. diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 0810f55..2fe57b8 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.75.2.39 2009/11/09 22:35:30 andreas_kupries Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.75.2.40 2010/07/25 10:15:08 nijtmans Exp $ */ #include "tclInt.h" @@ -323,9 +323,9 @@ Tcl_CreateInterp() * also updating the Tcl_CallFrame structure (or vice versa). */ - if (sizeof(Tcl_CallFrame) != sizeof(CallFrame)) { + if (sizeof(Tcl_CallFrame) < sizeof(CallFrame)) { /*NOTREACHED*/ - panic("Tcl_CallFrame and CallFrame are not the same size"); + panic("Tcl_CallFrame must not be smaller than CallFrame"); } /* diff --git a/generic/tclInt.h b/generic/tclInt.h index 6b6d774..23ef6df 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.118.2.36 2010/07/17 07:43:46 nijtmans Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.118.2.37 2010/07/25 10:15:08 nijtmans Exp $ */ #ifndef _TCLINT @@ -803,9 +803,6 @@ typedef struct CallFrame { * recognized by the compiler. The compiler * emits code that refers to these variables * using an index into this array. */ - VOID *dummy11; - VOID *dummy12; - VOID *dummy13; } CallFrame; #ifdef TCL_TIP280 |