diff options
| author | nijtmans <nijtmans> | 2010-07-25 10:16:42 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-07-25 10:16:42 (GMT) |
| commit | efc99c79f65bb242966678b4a9cabb66dd5fae01 (patch) | |
| tree | 3aa7bbb65c8bf5d7e5010e8adfcf9cae4d3a2d88 | |
| parent | 97a2349055115fbd99ae55711aa782ec9136b167 (diff) | |
| download | tcl-core_8_3_1_branch.zip tcl-core_8_3_1_branch.tar.gz tcl-core_8_3_1_branch.tar.bz2 | |
[Bug 3030870] make itcl 3.x built with pre-8.6 work in 8.6:
core_8_3_1_branch
relax the relation between Tcl_CallFrame and CallFrame.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tcl.h | 17 | ||||
| -rw-r--r-- | generic/tclBasic.c | 6 |
3 files changed, 18 insertions, 10 deletions
@@ -1,3 +1,8 @@ +2010-07-25 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tcl.h [Bug 3030870] make itcl 3.x built with pre-8.6 work in 8.6 + * generic/tclBasic.c Relax the relation between Tcl_CallFrame and CallFrame. + 2010-02-18 Jan Nijtmans <nijtmans@users.sf.net> * unix/tcl.m4, unix/configure: Fix sh quoting error reported in diff --git a/generic/tcl.h b/generic/tcl.h index 0268004..af3ab1b 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.70.2.10 2002/10/16 00:06:50 hobbs Exp $ + * RCS: @(#) $Id: tcl.h,v 1.70.2.11 2010/07/25 10:16:42 nijtmans Exp $ */ #ifndef _TCL @@ -781,14 +781,17 @@ typedef struct Tcl_CallFrame { Tcl_Namespace *nsPtr; int dummy1; int dummy2; - char *dummy3; - char *dummy4; - char *dummy5; + VOID *dummy3; + VOID *dummy4; + VOID *dummy5; int dummy6; - char *dummy7; - char *dummy8; + VOID *dummy7; + VOID *dummy8; int dummy9; - char* dummy10; + VOID *dummy10; + VOID *dummy11; + VOID *dummy12; + VOID *dummy13; } Tcl_CallFrame; /* diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 9a73e94..9e1fcf2 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -12,7 +12,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.27 2000/04/15 17:34:09 hobbs Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.27.2.1 2010/07/25 10:16:42 nijtmans Exp $ */ #include "tclInt.h" @@ -285,9 +285,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"); } /* |