summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--generic/tclBasic.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f51a9d5..ed377ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* generic/tclDecls.h [Bug 3029891] Functions that don't belong in the
* generic/tclTest.c stub table.
+ * generic/tclBasic.c From [Bug 3030870] make itcl 3.x built with pre-8.6
+ work in 8.6: Relax the relation between Tcl_CallFrame and CallFrame.
2010-07-16 Donal K. Fellows <dkf@users.sf.net>
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 8a6bc21..ef272d3 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -16,7 +16,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.458 2010/07/16 15:29:10 dkf Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.459 2010/07/24 06:45:01 nijtmans Exp $
*/
#include "tclInt.h"
@@ -475,9 +475,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");
}
if (cancelTableInitialized == 0) {