summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-07-17 07:42:44 (GMT)
committernijtmans <nijtmans>2010-07-17 07:42:44 (GMT)
commit201dbba4ce2f18849d8bdcbcd30772661ff2edb8 (patch)
tree04314e28be037cb9c2b9743bdae67f6ecc4345b8
parente18619f8e98dd48417c66e66c7446da3c75fd8ae (diff)
downloadtcl-201dbba4ce2f18849d8bdcbcd30772661ff2edb8.zip
tcl-201dbba4ce2f18849d8bdcbcd30772661ff2edb8.tar.gz
tcl-201dbba4ce2f18849d8bdcbcd30772661ff2edb8.tar.bz2
[Bug 3030870] make itcl 3.x built with pre-8.6 work in 8.6
-rw-r--r--ChangeLog5
-rw-r--r--generic/tcl.h19
-rw-r--r--generic/tclInt.h3
3 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index cad83dc..2ed0e11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
+ * generic/tclInt.h
+
2010-07-02 Donal K. Fellows <dkf@users.sf.net>
* generic/tclExecute.c (IllegalExprOperandType): [Bug 3024379]: Made
diff --git a/generic/tcl.h b/generic/tcl.h
index 98f90c9..a38b9e7 100644
--- a/generic/tcl.h
+++ b/generic/tcl.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: tcl.h,v 1.254.2.14 2010/01/29 09:38:48 nijtmans Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.254.2.15 2010/07/17 07:42:46 nijtmans Exp $
*/
#ifndef _TCL
@@ -860,16 +860,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;
- char *dummy11;
- char *dummy12;
+ VOID *dummy10;
+ VOID *dummy11;
+ VOID *dummy12;
+ VOID *dummy13;
} Tcl_CallFrame;
/*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 7e49ad0..8efd344 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.12 2010/05/25 10:37:18 nijtmans Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.362.2.13 2010/07/17 07:42:44 nijtmans Exp $
*/
#ifndef _TCLINT
@@ -1041,6 +1041,7 @@ typedef struct CallFrame {
* meaning of the value is, which we do not
* specify. */
LocalCache *localCachePtr;
+ VOID *dummy13;
} CallFrame;
#define FRAME_IS_PROC 0x1