summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2006-09-22 22:31:34 (GMT)
committerandreas_kupries <akupries@shaw.ca>2006-09-22 22:31:34 (GMT)
commit68d397d14ec547c033d0f9b5df612e06f638fef1 (patch)
tree05db0af115a457749e58bcd507447d4ed24540b6
parent84710c0562a0091891deddb2f101cd44798db8c2 (diff)
downloadtcl-68d397d14ec547c033d0f9b5df612e06f638fef1.zip
tcl-68d397d14ec547c033d0f9b5df612e06f638fef1.tar.gz
tcl-68d397d14ec547c033d0f9b5df612e06f638fef1.tar.bz2
* generic/tclInt.h: Moved TIP#268's field 'packagePrefer' to the
end of the structure, for better backward compatibility.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclInt.h20
2 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bde052..dda014d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-22 Andreas Kupries <andreask@activestate.com>
+
+ * generic/tclInt.h: Moved TIP#268's field 'packagePrefer' to the
+ end of the structure, for better backward compatibility.
+
2006-09-22 Andreas Kupries <andreask@activestate.com>
* generic/tclPkg.c (Tcl_PkgRequireEx): Changes handling of the
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 4fa0732..b5328ac 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.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: tclInt.h,v 1.118.2.23 2006/09/22 01:26:23 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.118.2.24 2006/09/22 22:31:34 andreas_kupries Exp $
*/
#ifndef _TCLINT
@@ -1295,15 +1295,6 @@ typedef struct Interp {
* require" commands for packages that
* aren't described in packageTable.
* Malloc'ed, may be NULL. */
-#ifdef TCL_TIP268
- /*
- * TIP #268.
- * The currently active selection mode,
- * i.e the package require preferences.
- */
-
- int packagePrefer; /* Current package selection mode. */
-#endif
/*
* Miscellaneous information:
@@ -1372,6 +1363,15 @@ typedef struct Interp {
int tracesForbiddingInline; /* Count of traces (in the list headed by
* tracePtr) that forbid inline bytecode
* compilation */
+#ifdef TCL_TIP268
+ /*
+ * TIP #268.
+ * The currently active selection mode,
+ * i.e the package require preferences.
+ */
+
+ int packagePrefer; /* Current package selection mode. */
+#endif
/*
* Statistical information about the bytecode compiler and interpreter's
* operation.