summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-07-17 07:43:46 (GMT)
committernijtmans <nijtmans>2010-07-17 07:43:46 (GMT)
commit801bb6b36320c0030ca52888b390e2f639c03ef3 (patch)
tree9452f9bece3b8b324caf1df861f01b6d8800ebd2
parentead9f59bfeff8817d34c2f6fb337e527334e830a (diff)
downloadtcl-801bb6b36320c0030ca52888b390e2f639c03ef3.zip
tcl-801bb6b36320c0030ca52888b390e2f639c03ef3.tar.gz
tcl-801bb6b36320c0030ca52888b390e2f639c03ef3.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.h18
-rw-r--r--generic/tclInt.h5
3 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d54502c..6563951 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-16 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tcl.h (Backport) take over definitions of _WIN32,
diff --git a/generic/tcl.h b/generic/tcl.h
index 3b8a9a4..7734175 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.153.2.37 2010/07/16 21:18:52 nijtmans Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.153.2.38 2010/07/17 07:43:46 nijtmans Exp $
*/
#ifndef _TCL
@@ -938,14 +938,18 @@ 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 *dummy10;
+ VOID *dummy11;
+ VOID *dummy12;
+ VOID *dummy13;
} Tcl_CallFrame;
diff --git a/generic/tclInt.h b/generic/tclInt.h
index e80f0d4..6b6d774 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.35 2009/08/25 20:59:11 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.118.2.36 2010/07/17 07:43:46 nijtmans Exp $
*/
#ifndef _TCLINT
@@ -803,6 +803,9 @@ 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