Letting CONST die a slow and graceful death, since NO_CONST was

broken since 8.4 and no-one complained about it.
author: nijtmans <nijtmans> 2008-10-22 20:23:59 (GMT)
committer: nijtmans <nijtmans> 2008-10-22 20:23:59 (GMT)
commit: 1598402d198ca92b97f5b62e7ea54b72bdd09ccf (patch)
tree: f697e3956660aaac137dd0ede261598f7662548e
parent: 7f623a9fc32a746e0fe85c9f913cbb1f81e92f8a (diff)
download: tcl-1598402d198ca92b97f5b62e7ea54b72bdd09ccf.zip
tcl-1598402d198ca92b97f5b62e7ea54b72bdd09ccf.tar.gz
tcl-1598402d198ca92b97f5b62e7ea54b72bdd09ccf.tar.bz2
17 files changed, 1783 insertions, 1761 deletions
diff --git a/ChangeLog b/ChangeLog
index 65cc478..1b89232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2008-10-22  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tcl.h:              CONST -> const and white-spacing
+	* generic/tclCompile.h:
+	* generic/tclEncoding.c:
+	* generic/tclStubInit.c:
+	* generic/tclStubLib.c:
+	* generic/tcl.decls
+	* generic/tclInt.decls
+	* generic/tclTomMath.decls
+	* generic/tclDecls.h:         (regenerated)
+	* generic/tclIntDecls.h:      (regenerated)
+	* generic/tclIntPlatDecls.h:  (regenerated)
+	* generic/tclOODecls.h:       (regenerated)
+	* generic/tclOOIntDecls.h:    (regenerated)
+	* generic/tclPlatDecls.h:     (regenerated)
+	* generic/tclTomMathDecls.h:  (regenerated)
+	* generic/tclIntDecls.h:      (regenerated)
+	* tools/genStubs.tcl:         CONST -> const and white-spacing
+
 2008-10-19  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclProc.c:    Reset -level and -code values to defaults
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 9290dcc..53604a6 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -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.decls,v 1.152 2008/10/05 22:25:35 nijtmans Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.153 2008/10/22 20:23:59 nijtmans Exp $
 
 library tcl
 
@@ -29,16 +29,16 @@ hooks {tclPlat tclInt tclIntPlat}
 # to preserve backwards compatibility.
 
 declare 0 generic {
-    int Tcl_PkgProvideEx(Tcl_Interp* interp, CONST char* name,
-	    CONST char* version, ClientData clientData)
+    int Tcl_PkgProvideEx(Tcl_Interp* interp, const char* name,
+	    const char* version, ClientData clientData)
 }
 declare 1 generic {
     CONST84_RETURN char * Tcl_PkgRequireEx(Tcl_Interp *interp,
-	    CONST char *name, CONST char *version, int exact,
+	    const char *name, const char *version, int exact,
 	    ClientData *clientDataPtr)
 }
 declare 2 generic {
-    void Tcl_Panic(CONST char *format, ...)
+    void Tcl_Panic(const char *format, ...)
 }
 declare 3 generic {
     char * Tcl_Alloc(unsigned int size)
@@ -50,14 +50,14 @@ declare 5 generic {
     char * Tcl_Realloc(char *ptr, unsigned int size)
 }
 declare 6 generic {
-    char * Tcl_DbCkalloc(unsigned int size, CONST char *file, int line)
+    char * Tcl_DbCkalloc(unsigned int size, const char *file, int line)
 }
 declare 7 generic {
-    int Tcl_DbCkfree(char *ptr, CONST char *file, int line)
+    int Tcl_DbCkfree(char *ptr, const char *file, int line)
 }
 declare 8 generic {
     char * Tcl_DbCkrealloc(char *ptr, unsigned int size,
-	    CONST char *file, int line)
+	    const char *file, int line)
 }
 
 # Tcl_CreateFileHandler and Tcl_DeleteFileHandler are only available on unix,
@@ -72,13 +72,13 @@ declare 10 unix {
     void Tcl_DeleteFileHandler(int fd)
 }
 declare 11 generic {
-    void Tcl_SetTimer(CONST Tcl_Time *timePtr)
+    void Tcl_SetTimer(const Tcl_Time *timePtr)
 }
 declare 12 generic {
     void Tcl_Sleep(int ms)
 }
 declare 13 generic {
-    int Tcl_WaitForEvent(CONST Tcl_Time *timePtr)
+    int Tcl_WaitForEvent(const Tcl_Time *timePtr)
 }
 declare 14 generic {
     int Tcl_AppendAllObjTypes(Tcl_Interp *interp, Tcl_Obj *objPtr)
@@ -87,48 +87,48 @@ declare 15 generic {
     void Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...)
 }
 declare 16 generic {
-    void Tcl_AppendToObj(Tcl_Obj* objPtr, CONST char* bytes, int length)
+    void Tcl_AppendToObj(Tcl_Obj* objPtr, const char* bytes, int length)
 }
 declare 17 generic {
-    Tcl_Obj * Tcl_ConcatObj(int objc, Tcl_Obj *CONST objv[])
+    Tcl_Obj * Tcl_ConcatObj(int objc, Tcl_Obj *const objv[])
 }
 declare 18 generic {
     int Tcl_ConvertToType(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    CONST Tcl_ObjType *typePtr)
+	    const Tcl_ObjType *typePtr)
 }
 declare 19 generic {
-    void Tcl_DbDecrRefCount(Tcl_Obj *objPtr, CONST char *file, int line)
+    void Tcl_DbDecrRefCount(Tcl_Obj *objPtr, const char *file, int line)
 }
 declare 20 generic {
-    void Tcl_DbIncrRefCount(Tcl_Obj *objPtr, CONST char *file, int line)
+    void Tcl_DbIncrRefCount(Tcl_Obj *objPtr, const char *file, int line)
 }
 declare 21 generic {
-    int Tcl_DbIsShared(Tcl_Obj *objPtr, CONST char *file, int line)
+    int Tcl_DbIsShared(Tcl_Obj *objPtr, const char *file, int line)
 }
 declare 22 generic {
-    Tcl_Obj * Tcl_DbNewBooleanObj(int boolValue, CONST char *file, int line)
+    Tcl_Obj * Tcl_DbNewBooleanObj(int boolValue, const char *file, int line)
 }
 declare 23 generic {
-    Tcl_Obj * Tcl_DbNewByteArrayObj(CONST unsigned char *bytes, int length,
-	    CONST char *file, int line)
+    Tcl_Obj * Tcl_DbNewByteArrayObj(const unsigned char *bytes, int length,
+	    const char *file, int line)
 }
 declare 24 generic {
     Tcl_Obj * Tcl_DbNewDoubleObj(double doubleValue,
-	    CONST char *file, int line)
+	    const char *file, int line)
 }
 declare 25 generic {
-    Tcl_Obj * Tcl_DbNewListObj(int objc, Tcl_Obj *CONST *objv,
-	    CONST char *file, int line)
+    Tcl_Obj * Tcl_DbNewListObj(int objc, Tcl_Obj *const *objv,
+	    const char *file, int line)
 }
 declare 26 generic {
-    Tcl_Obj * Tcl_DbNewLongObj(long longValue, CONST char *file, int line)
+    Tcl_Obj * Tcl_DbNewLongObj(long longValue, const char *file, int line)
 }
 declare 27 generic {
-    Tcl_Obj * Tcl_DbNewObj(CONST char *file, int line)
+    Tcl_Obj * Tcl_DbNewObj(const char *file, int line)
 }
 declare 28 generic {
-    Tcl_Obj * Tcl_DbNewStringObj(CONST char *bytes, int length,
-	    CONST char *file, int line)
+    Tcl_Obj * Tcl_DbNewStringObj(const char *bytes, int length,
+	    const char *file, int line)
 }
 declare 29 generic {
     Tcl_Obj * Tcl_DuplicateObj(Tcl_Obj *objPtr)
@@ -137,7 +137,7 @@ declare 30 generic {
     void TclFreeObj(Tcl_Obj *objPtr)
 }
 declare 31 generic {
-    int Tcl_GetBoolean(Tcl_Interp *interp, CONST char *src, int *boolPtr)
+    int Tcl_GetBoolean(Tcl_Interp *interp, const char *src, int *boolPtr)
 }
 declare 32 generic {
     int Tcl_GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -147,7 +147,7 @@ declare 33 generic {
     unsigned char * Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, int *lengthPtr)
 }
 declare 34 generic {
-    int Tcl_GetDouble(Tcl_Interp *interp, CONST char *src, double *doublePtr)
+    int Tcl_GetDouble(Tcl_Interp *interp, const char *src, double *doublePtr)
 }
 declare 35 generic {
     int Tcl_GetDoubleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -155,10 +155,10 @@ declare 35 generic {
 }
 declare 36 generic {
     int Tcl_GetIndexFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    CONST84 char *CONST *tablePtr, CONST char *msg, int flags, int *indexPtr)
+	    CONST84 char *const *tablePtr, const char *msg, int flags, int *indexPtr)
 }
 declare 37 generic {
-    int Tcl_GetInt(Tcl_Interp *interp, CONST char *src, int *intPtr)
+    int Tcl_GetInt(Tcl_Interp *interp, const char *src, int *intPtr)
 }
 declare 38 generic {
     int Tcl_GetIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr)
@@ -167,7 +167,7 @@ declare 39 generic {
     int Tcl_GetLongFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, long *longPtr)
 }
 declare 40 generic {
-    CONST86 Tcl_ObjType * Tcl_GetObjType(CONST char *typeName)
+    CONST86 Tcl_ObjType * Tcl_GetObjType(const char *typeName)
 }
 declare 41 generic {
     char * Tcl_GetStringFromObj(Tcl_Obj *objPtr, int *lengthPtr)
@@ -197,13 +197,13 @@ declare 47 generic {
 }
 declare 48 generic {
     int Tcl_ListObjReplace(Tcl_Interp *interp, Tcl_Obj *listPtr, int first,
-	    int count, int objc, Tcl_Obj *CONST objv[])
+	    int count, int objc, Tcl_Obj *const objv[])
 }
 declare 49 generic {
     Tcl_Obj *Tcl_NewBooleanObj(int boolValue)
 }
 declare 50 generic {
-    Tcl_Obj *Tcl_NewByteArrayObj(CONST unsigned char* bytes, int length)
+    Tcl_Obj *Tcl_NewByteArrayObj(const unsigned char* bytes, int length)
 }
 declare 51 generic {
     Tcl_Obj * Tcl_NewDoubleObj(double doubleValue)
@@ -212,7 +212,7 @@ declare 52 generic {
     Tcl_Obj * Tcl_NewIntObj(int intValue)
 }
 declare 53 generic {
-    Tcl_Obj * Tcl_NewListObj(int objc, Tcl_Obj *CONST objv[])
+    Tcl_Obj * Tcl_NewListObj(int objc, Tcl_Obj *const objv[])
 }
 declare 54 generic {
     Tcl_Obj * Tcl_NewLongObj(long longValue)
@@ -221,7 +221,7 @@ declare 55 generic {
     Tcl_Obj * Tcl_NewObj(void)
 }
 declare 56 generic {
-    Tcl_Obj *Tcl_NewStringObj(CONST char *bytes, int length)
+    Tcl_Obj *Tcl_NewStringObj(const char *bytes, int length)
 }
 declare 57 generic {
     void Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue)
@@ -230,7 +230,7 @@ declare 58 generic {
     unsigned char * Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int length)
 }
 declare 59 generic {
-    void Tcl_SetByteArrayObj(Tcl_Obj *objPtr, CONST unsigned char *bytes,
+    void Tcl_SetByteArrayObj(Tcl_Obj *objPtr, const unsigned char *bytes,
 	    int length)
 }
 declare 60 generic {
@@ -240,7 +240,7 @@ declare 61 generic {
     void Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue)
 }
 declare 62 generic {
-    void Tcl_SetListObj(Tcl_Obj *objPtr, int objc, Tcl_Obj *CONST objv[])
+    void Tcl_SetListObj(Tcl_Obj *objPtr, int objc, Tcl_Obj *const objv[])
 }
 declare 63 generic {
     void Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue)
@@ -249,20 +249,20 @@ declare 64 generic {
     void Tcl_SetObjLength(Tcl_Obj *objPtr, int length)
 }
 declare 65 generic {
-    void Tcl_SetStringObj(Tcl_Obj* objPtr, CONST char* bytes, int length)
+    void Tcl_SetStringObj(Tcl_Obj* objPtr, const char* bytes, int length)
 }
 declare 66 generic {
-    void Tcl_AddErrorInfo(Tcl_Interp *interp, CONST char *message)
+    void Tcl_AddErrorInfo(Tcl_Interp *interp, const char *message)
 }
 declare 67 generic {
-    void Tcl_AddObjErrorInfo(Tcl_Interp *interp, CONST char *message,
+    void Tcl_AddObjErrorInfo(Tcl_Interp *interp, const char *message,
 	    int length)
 }
 declare 68 generic {
     void Tcl_AllowExceptions(Tcl_Interp *interp)
 }
 declare 69 generic {
-    void Tcl_AppendElement(Tcl_Interp *interp, CONST char *element)
+    void Tcl_AppendElement(Tcl_Interp *interp, const char *element)
 }
 declare 70 generic {
     void Tcl_AppendResult(Tcl_Interp *interp, ...)
@@ -287,11 +287,11 @@ declare 76 generic {
     void Tcl_BackgroundError(Tcl_Interp *interp)
 }
 declare 77 generic {
-    char Tcl_Backslash(CONST char *src, int *readPtr)
+    char Tcl_Backslash(const char *src, int *readPtr)
 }
 declare 78 generic {
-    int Tcl_BadChannelOption(Tcl_Interp *interp, CONST char *optionName,
-	    CONST char *optionList)
+    int Tcl_BadChannelOption(Tcl_Interp *interp, const char *optionName,
+	    const char *optionList)
 }
 declare 79 generic {
     void Tcl_CallWhenDeleted(Tcl_Interp *interp, Tcl_InterpDeleteProc *proc,
@@ -304,31 +304,31 @@ declare 81 generic {
     int Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan)
 }
 declare 82 generic {
-    int Tcl_CommandComplete(CONST char *cmd)
+    int Tcl_CommandComplete(const char *cmd)
 }
 declare 83 generic {
-    char * Tcl_Concat(int argc, CONST84 char * CONST *argv)
+    char * Tcl_Concat(int argc, CONST84 char * const *argv)
 }
 declare 84 generic {
-    int Tcl_ConvertElement(CONST char *src, char *dst, int flags)
+    int Tcl_ConvertElement(const char *src, char *dst, int flags)
 }
 declare 85 generic {
-    int Tcl_ConvertCountedElement(CONST char *src, int length, char *dst,
+    int Tcl_ConvertCountedElement(const char *src, int length, char *dst,
 	    int flags)
 }
 declare 86 generic {
-    int Tcl_CreateAlias(Tcl_Interp *slave, CONST char *slaveCmd,
-	    Tcl_Interp *target, CONST char *targetCmd, int argc,
-	    CONST84 char * CONST *argv)
+    int Tcl_CreateAlias(Tcl_Interp *slave, const char *slaveCmd,
+	    Tcl_Interp *target, const char *targetCmd, int argc,
+	    CONST84 char * const *argv)
 }
 declare 87 generic {
-    int Tcl_CreateAliasObj(Tcl_Interp *slave, CONST char *slaveCmd,
-	    Tcl_Interp *target, CONST char *targetCmd, int objc,
-	    Tcl_Obj *CONST objv[])
+    int Tcl_CreateAliasObj(Tcl_Interp *slave, const char *slaveCmd,
+	    Tcl_Interp *target, const char *targetCmd, int objc,
+	    Tcl_Obj *const objv[])
 }
 declare 88 generic {
-    Tcl_Channel Tcl_CreateChannel(CONST Tcl_ChannelType *typePtr,
-	    CONST char *chanName, ClientData instanceData, int mask)
+    Tcl_Channel Tcl_CreateChannel(const Tcl_ChannelType *typePtr,
+	    const char *chanName, ClientData instanceData, int mask)
 }
 declare 89 generic {
     void Tcl_CreateChannelHandler(Tcl_Channel chan, int mask,
@@ -339,7 +339,7 @@ declare 90 generic {
 	    ClientData clientData)
 }
 declare 91 generic {
-    Tcl_Command Tcl_CreateCommand(Tcl_Interp *interp, CONST char *cmdName,
+    Tcl_Command Tcl_CreateCommand(Tcl_Interp *interp, const char *cmdName,
 	    Tcl_CmdProc *proc, ClientData clientData,
 	    Tcl_CmdDeleteProc *deleteProc)
 }
@@ -354,18 +354,18 @@ declare 94 generic {
     Tcl_Interp * Tcl_CreateInterp(void)
 }
 declare 95 generic {
-    void Tcl_CreateMathFunc(Tcl_Interp *interp, CONST char *name,
+    void Tcl_CreateMathFunc(Tcl_Interp *interp, const char *name,
 	    int numArgs, Tcl_ValueType *argTypes,
 	    Tcl_MathProc *proc, ClientData clientData)
 }
 declare 96 generic {
     Tcl_Command Tcl_CreateObjCommand(Tcl_Interp *interp,
-	    CONST char *cmdName,
+	    const char *cmdName,
 	    Tcl_ObjCmdProc *proc, ClientData clientData,
 	    Tcl_CmdDeleteProc *deleteProc)
 }
 declare 97 generic {
-    Tcl_Interp * Tcl_CreateSlave(Tcl_Interp *interp, CONST char *slaveName,
+    Tcl_Interp * Tcl_CreateSlave(Tcl_Interp *interp, const char *slaveName,
 	    int isSafe)
 }
 declare 98 generic {
@@ -377,7 +377,7 @@ declare 99 generic {
 	    Tcl_CmdTraceProc *proc, ClientData clientData)
 }
 declare 100 generic {
-    void Tcl_DeleteAssocData(Tcl_Interp *interp, CONST char *name)
+    void Tcl_DeleteAssocData(Tcl_Interp *interp, const char *name)
 }
 declare 101 generic {
     void Tcl_DeleteChannelHandler(Tcl_Channel chan, Tcl_ChannelProc *proc,
@@ -388,7 +388,7 @@ declare 102 generic {
 	    ClientData clientData)
 }
 declare 103 generic {
-    int Tcl_DeleteCommand(Tcl_Interp *interp, CONST char *cmdName)
+    int Tcl_DeleteCommand(Tcl_Interp *interp, const char *cmdName)
 }
 declare 104 generic {
     int Tcl_DeleteCommandFromToken(Tcl_Interp *interp, Tcl_Command command)
@@ -432,10 +432,10 @@ declare 116 generic {
     void Tcl_DoWhenIdle(Tcl_IdleProc *proc, ClientData clientData)
 }
 declare 117 generic {
-    char * Tcl_DStringAppend(Tcl_DString *dsPtr, CONST char *bytes, int length)
+    char * Tcl_DStringAppend(Tcl_DString *dsPtr, const char *bytes, int length)
 }
 declare 118 generic {
-    char * Tcl_DStringAppendElement(Tcl_DString *dsPtr, CONST char *element)
+    char * Tcl_DStringAppendElement(Tcl_DString *dsPtr, const char *element)
 }
 declare 119 generic {
     void Tcl_DStringEndSublist(Tcl_DString *dsPtr)
@@ -468,11 +468,11 @@ declare 128 generic {
     CONST84_RETURN char * Tcl_ErrnoMsg(int err)
 }
 declare 129 generic {
-    int Tcl_Eval(Tcl_Interp *interp, CONST char *script)
+    int Tcl_Eval(Tcl_Interp *interp, const char *script)
 }
 # This is obsolete, use Tcl_FSEvalFile
 declare 130 generic {
-    int Tcl_EvalFile(Tcl_Interp *interp, CONST char *fileName)
+    int Tcl_EvalFile(Tcl_Interp *interp, const char *fileName)
 }
 declare 131 generic {
     int Tcl_EvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
@@ -484,23 +484,23 @@ declare 133 generic {
     void Tcl_Exit(int status)
 }
 declare 134 generic {
-    int Tcl_ExposeCommand(Tcl_Interp *interp, CONST char *hiddenCmdToken,
-	    CONST char *cmdName)
+    int Tcl_ExposeCommand(Tcl_Interp *interp, const char *hiddenCmdToken,
+	    const char *cmdName)
 }
 declare 135 generic {
-    int Tcl_ExprBoolean(Tcl_Interp *interp, CONST char *expr, int *ptr)
+    int Tcl_ExprBoolean(Tcl_Interp *interp, const char *expr, int *ptr)
 }
 declare 136 generic {
     int Tcl_ExprBooleanObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *ptr)
 }
 declare 137 generic {
-    int Tcl_ExprDouble(Tcl_Interp *interp, CONST char *expr, double *ptr)
+    int Tcl_ExprDouble(Tcl_Interp *interp, const char *expr, double *ptr)
 }
 declare 138 generic {
     int Tcl_ExprDoubleObj(Tcl_Interp *interp, Tcl_Obj *objPtr, double *ptr)
 }
 declare 139 generic {
-    int Tcl_ExprLong(Tcl_Interp *interp, CONST char *expr, long *ptr)
+    int Tcl_ExprLong(Tcl_Interp *interp, const char *expr, long *ptr)
 }
 declare 140 generic {
     int Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr, long *ptr)
@@ -510,13 +510,13 @@ declare 141 generic {
 	    Tcl_Obj **resultPtrPtr)
 }
 declare 142 generic {
-    int Tcl_ExprString(Tcl_Interp *interp, CONST char *expr)
+    int Tcl_ExprString(Tcl_Interp *interp, const char *expr)
 }
 declare 143 generic {
     void Tcl_Finalize(void)
 }
 declare 144 generic {
-    void Tcl_FindExecutable(CONST char *argv0)
+    void Tcl_FindExecutable(const char *argv0)
 }
 declare 145 generic {
     Tcl_HashEntry * Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
@@ -529,21 +529,21 @@ declare 147 generic {
     void Tcl_FreeResult(Tcl_Interp *interp)
 }
 declare 148 generic {
-    int Tcl_GetAlias(Tcl_Interp *interp, CONST char *slaveCmd,
+    int Tcl_GetAlias(Tcl_Interp *interp, const char *slaveCmd,
 	    Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr,
 	    int *argcPtr, CONST84 char ***argvPtr)
 }
 declare 149 generic {
-    int Tcl_GetAliasObj(Tcl_Interp *interp, CONST char *slaveCmd,
+    int Tcl_GetAliasObj(Tcl_Interp *interp, const char *slaveCmd,
 	    Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr,
 	    int *objcPtr, Tcl_Obj ***objv)
 }
 declare 150 generic {
-    ClientData Tcl_GetAssocData(Tcl_Interp *interp, CONST char *name,
+    ClientData Tcl_GetAssocData(Tcl_Interp *interp, const char *name,
 	    Tcl_InterpDeleteProc **procPtr)
 }
 declare 151 generic {
-    Tcl_Channel Tcl_GetChannel(Tcl_Interp *interp, CONST char *chanName,
+    Tcl_Channel Tcl_GetChannel(Tcl_Interp *interp, const char *chanName,
 	    int *modePtr)
 }
 declare 152 generic {
@@ -564,13 +564,13 @@ declare 156 generic {
 }
 declare 157 generic {
     int Tcl_GetChannelOption(Tcl_Interp *interp, Tcl_Channel chan,
-	    CONST char *optionName, Tcl_DString *dsPtr)
+	    const char *optionName, Tcl_DString *dsPtr)
 }
 declare 158 generic {
     CONST86 Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan)
 }
 declare 159 generic {
-    int Tcl_GetCommandInfo(Tcl_Interp *interp, CONST char *cmdName,
+    int Tcl_GetCommandInfo(Tcl_Interp *interp, const char *cmdName,
 	    Tcl_CmdInfo *infoPtr)
 }
 declare 160 generic {
@@ -590,7 +590,7 @@ declare 164 generic {
     Tcl_Interp * Tcl_GetMaster(Tcl_Interp *interp)
 }
 declare 165 generic {
-    CONST char * Tcl_GetNameOfExecutable(void)
+    const char * Tcl_GetNameOfExecutable(void)
 }
 declare 166 generic {
     Tcl_Obj * Tcl_GetObjResult(Tcl_Interp *interp)
@@ -600,13 +600,13 @@ declare 166 generic {
 # generic interface, so we inlcude it here for compatibility reasons.
 
 declare 167 unix {
-    int Tcl_GetOpenFile(Tcl_Interp *interp, CONST char *chanID, int forWriting,
+    int Tcl_GetOpenFile(Tcl_Interp *interp, const char *chanID, int forWriting,
 	    int checkUsage, ClientData *filePtr)
 }
 # Obsolete.  Should now use Tcl_FSGetPathType which is objectified
 # and therefore usually faster.
 declare 168 generic {
-    Tcl_PathType Tcl_GetPathType(CONST char *path)
+    Tcl_PathType Tcl_GetPathType(const char *path)
 }
 declare 169 generic {
     int Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr)
@@ -618,7 +618,7 @@ declare 171 generic {
     int Tcl_GetServiceMode(void)
 }
 declare 172 generic {
-    Tcl_Interp * Tcl_GetSlave(Tcl_Interp *interp, CONST char *slaveName)
+    Tcl_Interp * Tcl_GetSlave(Tcl_Interp *interp, const char *slaveName)
 }
 declare 173 generic {
     Tcl_Channel Tcl_GetStdChannel(int type)
@@ -627,22 +627,22 @@ declare 174 generic {
     CONST84_RETURN char * Tcl_GetStringResult(Tcl_Interp *interp)
 }
 declare 175 generic {
-    CONST84_RETURN char * Tcl_GetVar(Tcl_Interp *interp, CONST char *varName,
+    CONST84_RETURN char * Tcl_GetVar(Tcl_Interp *interp, const char *varName,
 	    int flags)
 }
 declare 176 generic {
-    CONST84_RETURN char * Tcl_GetVar2(Tcl_Interp *interp, CONST char *part1,
-	    CONST char *part2, int flags)
+    CONST84_RETURN char * Tcl_GetVar2(Tcl_Interp *interp, const char *part1,
+	    const char *part2, int flags)
 }
 declare 177 generic {
-    int Tcl_GlobalEval(Tcl_Interp *interp, CONST char *command)
+    int Tcl_GlobalEval(Tcl_Interp *interp, const char *command)
 }
 declare 178 generic {
     int Tcl_GlobalEvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
 }
 declare 179 generic {
-    int Tcl_HideCommand(Tcl_Interp *interp, CONST char *cmdName,
-	    CONST char *hiddenCmdToken)
+    int Tcl_HideCommand(Tcl_Interp *interp, const char *cmdName,
+	    const char *hiddenCmdToken)
 }
 declare 180 generic {
     int Tcl_Init(Tcl_Interp *interp)
@@ -664,11 +664,11 @@ declare 185 generic {
 }
 # Obsolete, use Tcl_FSJoinPath
 declare 186 generic {
-    char * Tcl_JoinPath(int argc, CONST84 char * CONST *argv,
+    char * Tcl_JoinPath(int argc, CONST84 char * const *argv,
 	    Tcl_DString *resultPtr)
 }
 declare 187 generic {
-    int Tcl_LinkVar(Tcl_Interp *interp, CONST char *varName, char *addr,
+    int Tcl_LinkVar(Tcl_Interp *interp, const char *varName, char *addr,
 	    int type)
 }
 
@@ -687,7 +687,7 @@ declare 191 generic {
     Tcl_Channel Tcl_MakeTcpClientChannel(ClientData tcpSocket)
 }
 declare 192 generic {
-    char * Tcl_Merge(int argc, CONST84 char * CONST *argv)
+    char * Tcl_Merge(int argc, CONST84 char * const *argv)
 }
 declare 193 generic {
     Tcl_HashEntry * Tcl_NextHashEntry(Tcl_HashSearch *searchPtr)
@@ -709,16 +709,16 @@ declare 197 {unix win} {
 }
 # This is obsolete, use Tcl_FSOpenFileChannel
 declare 198 generic {
-    Tcl_Channel Tcl_OpenFileChannel(Tcl_Interp *interp, CONST char *fileName,
-	    CONST char *modeString, int permissions)
+    Tcl_Channel Tcl_OpenFileChannel(Tcl_Interp *interp, const char *fileName,
+	    const char *modeString, int permissions)
 }
 declare 199 generic {
     Tcl_Channel Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
-	    CONST char *address, CONST char *myaddr, int myport, int async)
+	    const char *address, const char *myaddr, int myport, int async)
 }
 declare 200 generic {
     Tcl_Channel Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
-	    CONST char *host, Tcl_TcpAcceptProc *acceptProc,
+	    const char *host, Tcl_TcpAcceptProc *acceptProc,
 	    ClientData callbackData)
 }
 declare 201 generic {
@@ -728,7 +728,7 @@ declare 202 generic {
     void Tcl_PrintDouble(Tcl_Interp *interp, double value, char *dst)
 }
 declare 203 generic {
-    int Tcl_PutEnv(CONST char *assignment)
+    int Tcl_PutEnv(const char *assignment)
 }
 declare 204 generic {
     CONST84_RETURN char * Tcl_PosixError(Tcl_Interp *interp)
@@ -743,7 +743,7 @@ declare 207 {unix win} {
     void Tcl_ReapDetachedProcs(void)
 }
 declare 208 generic {
-    int Tcl_RecordAndEval(Tcl_Interp *interp, CONST char *cmd, int flags)
+    int Tcl_RecordAndEval(Tcl_Interp *interp, const char *cmd, int flags)
 }
 declare 209 generic {
     int Tcl_RecordAndEvalObj(Tcl_Interp *interp, Tcl_Obj *cmdPtr, int flags)
@@ -752,18 +752,18 @@ declare 210 generic {
     void Tcl_RegisterChannel(Tcl_Interp *interp, Tcl_Channel chan)
 }
 declare 211 generic {
-    void Tcl_RegisterObjType(CONST Tcl_ObjType *typePtr)
+    void Tcl_RegisterObjType(const Tcl_ObjType *typePtr)
 }
 declare 212 generic {
-    Tcl_RegExp Tcl_RegExpCompile(Tcl_Interp *interp, CONST char *pattern)
+    Tcl_RegExp Tcl_RegExpCompile(Tcl_Interp *interp, const char *pattern)
 }
 declare 213 generic {
     int Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
-	    CONST char *text, CONST char *start)
+	    const char *text, const char *start)
 }
 declare 214 generic {
-    int Tcl_RegExpMatch(Tcl_Interp *interp, CONST char *text,
-	    CONST char *pattern)
+    int Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
+	    const char *pattern)
 }
 declare 215 generic {
     void Tcl_RegExpRange(Tcl_RegExp regexp, int index,
@@ -776,10 +776,10 @@ declare 217 generic {
     void Tcl_ResetResult(Tcl_Interp *interp)
 }
 declare 218 generic {
-    int Tcl_ScanElement(CONST char *str, int *flagPtr)
+    int Tcl_ScanElement(const char *str, int *flagPtr)
 }
 declare 219 generic {
-    int Tcl_ScanCountedElement(CONST char *str, int length, int *flagPtr)
+    int Tcl_ScanCountedElement(const char *str, int length, int *flagPtr)
 }
 # Obsolete
 declare 220 generic {
@@ -792,7 +792,7 @@ declare 222 generic {
     int Tcl_ServiceEvent(int flags)
 }
 declare 223 generic {
-    void Tcl_SetAssocData(Tcl_Interp *interp, CONST char *name,
+    void Tcl_SetAssocData(Tcl_Interp *interp, const char *name,
 	    Tcl_InterpDeleteProc *proc, ClientData clientData)
 }
 declare 224 generic {
@@ -800,11 +800,11 @@ declare 224 generic {
 }
 declare 225 generic {
     int Tcl_SetChannelOption(Tcl_Interp *interp, Tcl_Channel chan,
-	    CONST char *optionName, CONST char *newValue)
+	    const char *optionName, const char *newValue)
 }
 declare 226 generic {
-    int Tcl_SetCommandInfo(Tcl_Interp *interp, CONST char *cmdName,
-	    CONST Tcl_CmdInfo *infoPtr)
+    int Tcl_SetCommandInfo(Tcl_Interp *interp, const char *cmdName,
+	    const Tcl_CmdInfo *infoPtr)
 }
 declare 227 generic {
     void Tcl_SetErrno(int err)
@@ -813,7 +813,7 @@ declare 228 generic {
     void Tcl_SetErrorCode(Tcl_Interp *interp, ...)
 }
 declare 229 generic {
-    void Tcl_SetMaxBlockTime(CONST Tcl_Time *timePtr)
+    void Tcl_SetMaxBlockTime(const Tcl_Time *timePtr)
 }
 declare 230 generic {
     void Tcl_SetPanicProc(Tcl_PanicProc *panicProc)
@@ -838,12 +838,12 @@ declare 236 generic {
     void Tcl_SetStdChannel(Tcl_Channel channel, int type)
 }
 declare 237 generic {
-    CONST84_RETURN char * Tcl_SetVar(Tcl_Interp *interp, CONST char *varName,
-	    CONST char *newValue, int flags)
+    CONST84_RETURN char * Tcl_SetVar(Tcl_Interp *interp, const char *varName,
+	    const char *newValue, int flags)
 }
 declare 238 generic {
-    CONST84_RETURN char * Tcl_SetVar2(Tcl_Interp *interp, CONST char *part1,
-	    CONST char *part2, CONST char *newValue, int flags)
+    CONST84_RETURN char * Tcl_SetVar2(Tcl_Interp *interp, const char *part1,
+	    const char *part2, const char *newValue, int flags)
 }
 declare 239 generic {
     CONST84_RETURN char * Tcl_SignalId(int sig)
@@ -855,96 +855,96 @@ declare 241 generic {
     void Tcl_SourceRCFile(Tcl_Interp *interp)
 }
 declare 242 generic {
-    int Tcl_SplitList(Tcl_Interp *interp, CONST char *listStr, int *argcPtr,
+    int Tcl_SplitList(Tcl_Interp *interp, const char *listStr, int *argcPtr,
 	    CONST84 char ***argvPtr)
 }
 # Obsolete, use Tcl_FSSplitPath
 declare 243 generic {
-    void Tcl_SplitPath(CONST char *path, int *argcPtr, CONST84 char ***argvPtr)
+    void Tcl_SplitPath(const char *path, int *argcPtr, CONST84 char ***argvPtr)
 }
 declare 244 generic {
-    void Tcl_StaticPackage(Tcl_Interp *interp, CONST char *pkgName,
+    void Tcl_StaticPackage(Tcl_Interp *interp, const char *pkgName,
 	    Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc)
 }
 declare 245 generic {
-    int Tcl_StringMatch(CONST char *str, CONST char *pattern)
+    int Tcl_StringMatch(const char *str, const char *pattern)
 }
 # Obsolete
 declare 246 generic {
     int Tcl_TellOld(Tcl_Channel chan)
 }
 declare 247 generic {
-    int Tcl_TraceVar(Tcl_Interp *interp, CONST char *varName, int flags,
+    int Tcl_TraceVar(Tcl_Interp *interp, const char *varName, int flags,
 	    Tcl_VarTraceProc *proc, ClientData clientData)
 }
 declare 248 generic {
-    int Tcl_TraceVar2(Tcl_Interp *interp, CONST char *part1, CONST char *part2,
+    int Tcl_TraceVar2(Tcl_Interp *interp, const char *part1, const char *part2,
 	    int flags, Tcl_VarTraceProc *proc, ClientData clientData)
 }
 declare 249 generic {
-    char * Tcl_TranslateFileName(Tcl_Interp *interp, CONST char *name,
+    char * Tcl_TranslateFileName(Tcl_Interp *interp, const char *name,
 	    Tcl_DString *bufferPtr)
 }
 declare 250 generic {
-    int Tcl_Ungets(Tcl_Channel chan, CONST char *str, int len, int atHead)
+    int Tcl_Ungets(Tcl_Channel chan, const char *str, int len, int atHead)
 }
 declare 251 generic {
-    void Tcl_UnlinkVar(Tcl_Interp *interp, CONST char *varName)
+    void Tcl_UnlinkVar(Tcl_Interp *interp, const char *varName)
 }
 declare 252 generic {
     int Tcl_UnregisterChannel(Tcl_Interp *interp, Tcl_Channel chan)
 }
 declare 253 generic {
-    int Tcl_UnsetVar(Tcl_Interp *interp, CONST char *varName, int flags)
+    int Tcl_UnsetVar(Tcl_Interp *interp, const char *varName, int flags)
 }
 declare 254 generic {
-    int Tcl_UnsetVar2(Tcl_Interp *interp, CONST char *part1, CONST char *part2,
+    int Tcl_UnsetVar2(Tcl_Interp *interp, const char *part1, const char *part2,
 	    int flags)
 }
 declare 255 generic {
-    void Tcl_UntraceVar(Tcl_Interp *interp, CONST char *varName, int flags,
+    void Tcl_UntraceVar(Tcl_Interp *interp, const char *varName, int flags,
 	    Tcl_VarTraceProc *proc, ClientData clientData)
 }
 declare 256 generic {
-    void Tcl_UntraceVar2(Tcl_Interp *interp, CONST char *part1,
-	    CONST char *part2, int flags, Tcl_VarTraceProc *proc,
+    void Tcl_UntraceVar2(Tcl_Interp *interp, const char *part1,
+	    const char *part2, int flags, Tcl_VarTraceProc *proc,
 	    ClientData clientData)
 }
 declare 257 generic {
-    void Tcl_UpdateLinkedVar(Tcl_Interp *interp, CONST char *varName)
+    void Tcl_UpdateLinkedVar(Tcl_Interp *interp, const char *varName)
 }
 declare 258 generic {
-    int Tcl_UpVar(Tcl_Interp *interp, CONST char *frameName,
-	    CONST char *varName, CONST char *localName, int flags)
+    int Tcl_UpVar(Tcl_Interp *interp, const char *frameName,
+	    const char *varName, const char *localName, int flags)
 }
 declare 259 generic {
-    int Tcl_UpVar2(Tcl_Interp *interp, CONST char *frameName, CONST char *part1,
-	    CONST char *part2, CONST char *localName, int flags)
+    int Tcl_UpVar2(Tcl_Interp *interp, const char *frameName, const char *part1,
+	    const char *part2, const char *localName, int flags)
 }
 declare 260 generic {
     int Tcl_VarEval(Tcl_Interp *interp, ...)
 }
 declare 261 generic {
-    ClientData Tcl_VarTraceInfo(Tcl_Interp *interp, CONST char *varName,
+    ClientData Tcl_VarTraceInfo(Tcl_Interp *interp, const char *varName,
 	    int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData)
 }
 declare 262 generic {
-    ClientData Tcl_VarTraceInfo2(Tcl_Interp *interp, CONST char *part1,
-	    CONST char *part2, int flags, Tcl_VarTraceProc *procPtr,
+    ClientData Tcl_VarTraceInfo2(Tcl_Interp *interp, const char *part1,
+	    const char *part2, int flags, Tcl_VarTraceProc *procPtr,
 	    ClientData prevClientData)
 }
 declare 263 generic {
-    int Tcl_Write(Tcl_Channel chan, CONST char *s, int slen)
+    int Tcl_Write(Tcl_Channel chan, const char *s, int slen)
 }
 declare 264 generic {
     void Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
-	    Tcl_Obj *CONST objv[], CONST char *message)
+	    Tcl_Obj *const objv[], const char *message)
 }
 declare 265 generic {
-    int Tcl_DumpActiveMemory(CONST char *fileName)
+    int Tcl_DumpActiveMemory(const char *fileName)
 }
 declare 266 generic {
-    void Tcl_ValidateAllMemory(CONST char *file, int line)
+    void Tcl_ValidateAllMemory(const char *file, int line)
 }
 declare 267 generic {
     void Tcl_AppendResultVA(Tcl_Interp *interp, va_list argList)
@@ -956,26 +956,26 @@ declare 269 generic {
     CONST84_RETURN char * Tcl_HashStats(Tcl_HashTable *tablePtr)
 }
 declare 270 generic {
-    CONST84_RETURN char * Tcl_ParseVar(Tcl_Interp *interp, CONST char *start,
+    CONST84_RETURN char * Tcl_ParseVar(Tcl_Interp *interp, const char *start,
 	    CONST84 char **termPtr)
 }
 declare 271 generic {
-    CONST84_RETURN char * Tcl_PkgPresent(Tcl_Interp *interp, CONST char *name,
-	    CONST char *version, int exact)
+    CONST84_RETURN char * Tcl_PkgPresent(Tcl_Interp *interp, const char *name,
+	    const char *version, int exact)
 }
 declare 272 generic {
     CONST84_RETURN char * Tcl_PkgPresentEx(Tcl_Interp *interp,
-	    CONST char *name, CONST char *version, int exact,
+	    const char *name, const char *version, int exact,
 	    ClientData *clientDataPtr)
 }
 declare 273 generic {
-    int Tcl_PkgProvide(Tcl_Interp *interp, CONST char *name,
-	    CONST char *version)
+    int Tcl_PkgProvide(Tcl_Interp *interp, const char *name,
+	    const char *version)
 }
 # TIP #268: The internally used new Require function is in slot 573.
 declare 274 generic {
-    CONST84_RETURN char * Tcl_PkgRequire(Tcl_Interp *interp, CONST char *name,
-	    CONST char *version, int exact)
+    CONST84_RETURN char * Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
+	    const char *version, int exact)
 }
 declare 275 generic {
     void Tcl_SetErrorCodeVA(Tcl_Interp *interp, va_list argList)
@@ -987,7 +987,7 @@ declare 277 generic {
     Tcl_Pid Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options)
 }
 declare 278 generic {
-    void Tcl_PanicVA(CONST char *format, va_list argList)
+    void Tcl_PanicVA(const char *format, va_list argList)
 }
 declare 279 generic {
     void Tcl_GetVersion(int *major, int *minor, int *patchLevel, int *type)
@@ -1012,7 +1012,7 @@ declare 280 generic {
 
 declare 281 generic {
     Tcl_Channel Tcl_StackChannel(Tcl_Interp *interp,
-	    CONST Tcl_ChannelType *typePtr, ClientData instanceData,
+	    const Tcl_ChannelType *typePtr, ClientData instanceData,
 	    int mask, Tcl_Channel prevChan)
 }
 declare 282 generic {
@@ -1038,7 +1038,7 @@ declare 286 generic {
     void Tcl_AppendObjToObj(Tcl_Obj *objPtr, Tcl_Obj *appendObjPtr)
 }
 declare 287 generic {
-    Tcl_Encoding Tcl_CreateEncoding(CONST Tcl_EncodingType *typePtr)
+    Tcl_Encoding Tcl_CreateEncoding(const Tcl_EncodingType *typePtr)
 }
 declare 288 generic {
     void Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc, ClientData clientData)
@@ -1050,11 +1050,11 @@ declare 290 generic {
     void Tcl_DiscardResult(Tcl_SavedResult *statePtr)
 }
 declare 291 generic {
-    int Tcl_EvalEx(Tcl_Interp *interp, CONST char *script, int numBytes,
+    int Tcl_EvalEx(Tcl_Interp *interp, const char *script, int numBytes,
 	    int flags)
 }
 declare 292 generic {
-    int Tcl_EvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
+    int Tcl_EvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
 	    int flags)
 }
 declare 293 generic {
@@ -1065,13 +1065,13 @@ declare 294 generic {
 }
 declare 295 generic {
     int Tcl_ExternalToUtf(Tcl_Interp *interp, Tcl_Encoding encoding,
-	    CONST char *src, int srcLen, int flags,
+	    const char *src, int srcLen, int flags,
 	    Tcl_EncodingState *statePtr, char *dst, int dstLen,
 	    int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
 }
 declare 296 generic {
     char * Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
-	    CONST char *src, int srcLen, Tcl_DString *dsPtr)
+	    const char *src, int srcLen, Tcl_DString *dsPtr)
 }
 declare 297 generic {
     void Tcl_FinalizeThread(void)
@@ -1086,7 +1086,7 @@ declare 300 generic {
     Tcl_ThreadId Tcl_GetCurrentThread(void)
 }
 declare 301 generic {
-    Tcl_Encoding Tcl_GetEncoding(Tcl_Interp *interp, CONST char *name)
+    Tcl_Encoding Tcl_GetEncoding(Tcl_Interp *interp, const char *name)
 }
 declare 302 generic {
     CONST84_RETURN char * Tcl_GetEncodingName(Tcl_Encoding encoding)
@@ -1096,15 +1096,15 @@ declare 303 generic {
 }
 declare 304 generic {
     int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    CONST VOID *tablePtr, int offset, CONST char *msg, int flags,
+	    const VOID *tablePtr, int offset, const char *msg, int flags,
 	    int *indexPtr)
 }
 declare 305 generic {
     VOID * Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, int size)
 }
 declare 306 generic {
-    Tcl_Obj * Tcl_GetVar2Ex(Tcl_Interp *interp, CONST char *part1,
-	    CONST char *part2, int flags)
+    Tcl_Obj * Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
+	    const char *part2, int flags)
 }
 declare 307 generic {
     ClientData Tcl_InitNotifier(void)
@@ -1120,10 +1120,10 @@ declare 310 generic {
 }
 declare 311 generic {
     void Tcl_ConditionWait(Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr,
-	    CONST Tcl_Time *timePtr)
+	    const Tcl_Time *timePtr)
 }
 declare 312 generic {
-    int Tcl_NumUtfChars(CONST char *src, int length)
+    int Tcl_NumUtfChars(const char *src, int length)
 }
 declare 313 generic {
     int Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead,
@@ -1136,11 +1136,11 @@ declare 315 generic {
     void Tcl_SaveResult(Tcl_Interp *interp, Tcl_SavedResult *statePtr)
 }
 declare 316 generic {
-    int Tcl_SetSystemEncoding(Tcl_Interp *interp, CONST char *name)
+    int Tcl_SetSystemEncoding(Tcl_Interp *interp, const char *name)
 }
 declare 317 generic {
-    Tcl_Obj * Tcl_SetVar2Ex(Tcl_Interp *interp, CONST char *part1,
-            CONST char *part2, Tcl_Obj *newValuePtr, int flags)
+    Tcl_Obj * Tcl_SetVar2Ex(Tcl_Interp *interp, const char *part1,
+            const char *part2, Tcl_Obj *newValuePtr, int flags)
 }
 declare 318 generic {
     void Tcl_ThreadAlert(Tcl_ThreadId threadId)
@@ -1150,7 +1150,7 @@ declare 319 generic {
 	    Tcl_QueuePosition position)
 }
 declare 320 generic {
-    Tcl_UniChar Tcl_UniCharAtIndex(CONST char *src, int index)
+    Tcl_UniChar Tcl_UniCharAtIndex(const char *src, int index)
 }
 declare 321 generic {
     Tcl_UniChar Tcl_UniCharToLower(int ch)
@@ -1165,35 +1165,35 @@ declare 324 generic {
     int Tcl_UniCharToUtf(int ch, char *buf)
 }
 declare 325 generic {
-    CONST84_RETURN char * Tcl_UtfAtIndex(CONST char *src, int index)
+    CONST84_RETURN char * Tcl_UtfAtIndex(const char *src, int index)
 }
 declare 326 generic {
-    int Tcl_UtfCharComplete(CONST char *src, int length)
+    int Tcl_UtfCharComplete(const char *src, int length)
 }
 declare 327 generic {
-    int Tcl_UtfBackslash(CONST char *src, int *readPtr, char *dst)
+    int Tcl_UtfBackslash(const char *src, int *readPtr, char *dst)
 }
 declare 328 generic {
-    CONST84_RETURN char * Tcl_UtfFindFirst(CONST char *src, int ch)
+    CONST84_RETURN char * Tcl_UtfFindFirst(const char *src, int ch)
 }
 declare 329 generic {
-    CONST84_RETURN char * Tcl_UtfFindLast(CONST char *src, int ch)
+    CONST84_RETURN char * Tcl_UtfFindLast(const char *src, int ch)
 }
 declare 330 generic {
-    CONST84_RETURN char * Tcl_UtfNext(CONST char *src)
+    CONST84_RETURN char * Tcl_UtfNext(const char *src)
 }
 declare 331 generic {
-    CONST84_RETURN char * Tcl_UtfPrev(CONST char *src, CONST char *start)
+    CONST84_RETURN char * Tcl_UtfPrev(const char *src, const char *start)
 }
 declare 332 generic {
     int Tcl_UtfToExternal(Tcl_Interp *interp, Tcl_Encoding encoding,
-	    CONST char *src, int srcLen, int flags,
+	    const char *src, int srcLen, int flags,
 	    Tcl_EncodingState *statePtr, char *dst, int dstLen,
 	    int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
 }
 declare 333 generic {
     char * Tcl_UtfToExternalDString(Tcl_Encoding encoding,
-	    CONST char *src, int srcLen, Tcl_DString *dsPtr)
+	    const char *src, int srcLen, Tcl_DString *dsPtr)
 }
 declare 334 generic {
     int Tcl_UtfToLower(char *src)
@@ -1202,13 +1202,13 @@ declare 335 generic {
     int Tcl_UtfToTitle(char *src)
 }
 declare 336 generic {
-    int Tcl_UtfToUniChar(CONST char *src, Tcl_UniChar *chPtr)
+    int Tcl_UtfToUniChar(const char *src, Tcl_UniChar *chPtr)
 }
 declare 337 generic {
     int Tcl_UtfToUpper(char *src)
 }
 declare 338 generic {
-    int Tcl_WriteChars(Tcl_Channel chan, CONST char *src, int srcLen)
+    int Tcl_WriteChars(Tcl_Channel chan, const char *src, int srcLen)
 }
 declare 339 generic {
     int Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr)
@@ -1220,7 +1220,7 @@ declare 341 generic {
     CONST84_RETURN char * Tcl_GetDefaultEncodingDir(void)
 }
 declare 342 generic {
-    void Tcl_SetDefaultEncodingDir(CONST char *path)
+    void Tcl_SetDefaultEncodingDir(const char *path)
 }
 declare 343 generic {
     void Tcl_AlertNotifier(ClientData clientData)
@@ -1250,18 +1250,18 @@ declare 351 generic {
     int Tcl_UniCharIsWordChar(int ch)
 }
 declare 352 generic {
-    int Tcl_UniCharLen(CONST Tcl_UniChar *uniStr)
+    int Tcl_UniCharLen(const Tcl_UniChar *uniStr)
 }
 declare 353 generic {
-    int Tcl_UniCharNcmp(CONST Tcl_UniChar *ucs, CONST Tcl_UniChar *uct,
+    int Tcl_UniCharNcmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct,
 	    unsigned long numChars)
 }
 declare 354 generic {
-    char * Tcl_UniCharToUtfDString(CONST Tcl_UniChar *uniStr,
+    char * Tcl_UniCharToUtfDString(const Tcl_UniChar *uniStr,
 	    int uniLength, Tcl_DString *dsPtr)
 }
 declare 355 generic {
-    Tcl_UniChar * Tcl_UtfToUniCharDString(CONST char *src,
+    Tcl_UniChar * Tcl_UtfToUniCharDString(const char *src,
 	    int length, Tcl_DString *dsPtr)
 }
 declare 356 generic {
@@ -1276,28 +1276,28 @@ declare 358 generic {
     void Tcl_FreeParse(Tcl_Parse *parsePtr)
 }
 declare 359 generic {
-    void Tcl_LogCommandInfo(Tcl_Interp *interp, CONST char *script,
-	    CONST char *command, int length)
+    void Tcl_LogCommandInfo(Tcl_Interp *interp, const char *script,
+	    const char *command, int length)
 }
 declare 360 generic {
-    int Tcl_ParseBraces(Tcl_Interp *interp, CONST char *start, int numBytes,
+    int Tcl_ParseBraces(Tcl_Interp *interp, const char *start, int numBytes,
 	    Tcl_Parse *parsePtr, int append, CONST84 char **termPtr)
 }
 declare 361 generic {
-    int Tcl_ParseCommand(Tcl_Interp *interp, CONST char *start, int numBytes,
+    int Tcl_ParseCommand(Tcl_Interp *interp, const char *start, int numBytes,
 	    int nested, Tcl_Parse *parsePtr)
 }
 declare 362 generic {
-    int Tcl_ParseExpr(Tcl_Interp *interp, CONST char *start, int numBytes,
+    int Tcl_ParseExpr(Tcl_Interp *interp, const char *start, int numBytes,
 	    Tcl_Parse *parsePtr)
 }
 declare 363 generic {
-    int Tcl_ParseQuotedString(Tcl_Interp *interp, CONST char *start,
+    int Tcl_ParseQuotedString(Tcl_Interp *interp, const char *start,
 	    int numBytes, Tcl_Parse *parsePtr, int append,
 	    CONST84 char **termPtr)
 }
 declare 364 generic {
-    int Tcl_ParseVarName(Tcl_Interp *interp, CONST char *start, int numBytes,
+    int Tcl_ParseVarName(Tcl_Interp *interp, const char *start, int numBytes,
 	    Tcl_Parse *parsePtr, int append)
 }
 # These 4 functions are obsolete, use Tcl_FSGetCwd, Tcl_FSChdir,
@@ -1306,22 +1306,22 @@ declare 365 generic {
     char *Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
 }
 declare 366 generic {
-   int Tcl_Chdir(CONST char *dirName)
+   int Tcl_Chdir(const char *dirName)
 }
 declare 367 generic {
-   int Tcl_Access(CONST char *path, int mode)
+   int Tcl_Access(const char *path, int mode)
 }
 declare 368 generic {
-    int Tcl_Stat(CONST char *path, struct stat *bufPtr)
+    int Tcl_Stat(const char *path, struct stat *bufPtr)
 }
 declare 369 generic {
-    int Tcl_UtfNcmp(CONST char *s1, CONST char *s2, unsigned long n)
+    int Tcl_UtfNcmp(const char *s1, const char *s2, unsigned long n)
 }
 declare 370 generic {
-    int Tcl_UtfNcasecmp(CONST char *s1, CONST char *s2, unsigned long n)
+    int Tcl_UtfNcasecmp(const char *s1, const char *s2, unsigned long n)
 }
 declare 371 generic {
-    int Tcl_StringCaseMatch(CONST char *str, CONST char *pattern, int nocase)
+    int Tcl_StringCaseMatch(const char *str, const char *pattern, int nocase)
 }
 declare 372 generic {
     int Tcl_UniCharIsControl(int ch)
@@ -1343,10 +1343,10 @@ declare 377 generic {
     void Tcl_RegExpGetInfo(Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr)
 }
 declare 378 generic {
-    Tcl_Obj * Tcl_NewUnicodeObj(CONST Tcl_UniChar *unicode, int numChars)
+    Tcl_Obj * Tcl_NewUnicodeObj(const Tcl_UniChar *unicode, int numChars)
 }
 declare 379 generic {
-    void Tcl_SetUnicodeObj(Tcl_Obj *objPtr, CONST Tcl_UniChar *unicode,
+    void Tcl_SetUnicodeObj(Tcl_Obj *objPtr, const Tcl_UniChar *unicode,
 	    int numChars)
 }
 declare 380 generic {
@@ -1362,7 +1362,7 @@ declare 383 generic {
     Tcl_Obj * Tcl_GetRange(Tcl_Obj *objPtr, int first, int last)
 }
 declare 384 generic {
-    void Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr, CONST Tcl_UniChar *unicode,
+    void Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr, const Tcl_UniChar *unicode,
 	    int length)
 }
 declare 385 generic {
@@ -1379,11 +1379,11 @@ declare 388 generic {
     int Tcl_GetChannelNames(Tcl_Interp *interp)
 }
 declare 389 generic {
-    int Tcl_GetChannelNamesEx(Tcl_Interp *interp, CONST char *pattern)
+    int Tcl_GetChannelNamesEx(Tcl_Interp *interp, const char *pattern)
 }
 declare 390 generic {
     int Tcl_ProcObjCmd(ClientData clientData, Tcl_Interp *interp,
-	    int objc, Tcl_Obj *CONST objv[])
+	    int objc, Tcl_Obj *const objv[])
 }
 declare 391 generic {
     void Tcl_ConditionFinalize(Tcl_Condition *condPtr)
@@ -1401,7 +1401,7 @@ declare 394 generic {
     int Tcl_ReadRaw(Tcl_Channel chan, char *dst, int bytesToRead)
 }
 declare 395 generic {
-    int Tcl_WriteRaw(Tcl_Channel chan, CONST char *src, int srcLen)
+    int Tcl_WriteRaw(Tcl_Channel chan, const char *src, int srcLen)
 }
 declare 396 generic {
     Tcl_Channel Tcl_GetTopChannel(Tcl_Channel chan)
@@ -1410,59 +1410,59 @@ declare 397 generic {
     int Tcl_ChannelBuffered(Tcl_Channel chan)
 }
 declare 398 generic {
-    CONST84_RETURN char * Tcl_ChannelName(CONST Tcl_ChannelType *chanTypePtr)
+    CONST84_RETURN char * Tcl_ChannelName(const Tcl_ChannelType *chanTypePtr)
 }
 declare 399 generic {
     Tcl_ChannelTypeVersion Tcl_ChannelVersion(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 400 generic {
     Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 401 generic {
     Tcl_DriverCloseProc * Tcl_ChannelCloseProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 402 generic {
     Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 403 generic {
     Tcl_DriverInputProc * Tcl_ChannelInputProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 404 generic {
     Tcl_DriverOutputProc * Tcl_ChannelOutputProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 405 generic {
     Tcl_DriverSeekProc * Tcl_ChannelSeekProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 406 generic {
     Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 407 generic {
     Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 408 generic {
     Tcl_DriverWatchProc * Tcl_ChannelWatchProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 409 generic {
     Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 410 generic {
     Tcl_DriverFlushProc * Tcl_ChannelFlushProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 declare 411 generic {
     Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 
 # Introduced in 8.4a2
@@ -1485,55 +1485,55 @@ declare 417 generic {
     void Tcl_ClearChannelHandlers(Tcl_Channel channel)
 }
 declare 418 generic {
-    int Tcl_IsChannelExisting(CONST char* channelName)
+    int Tcl_IsChannelExisting(const char* channelName)
 }
 declare 419 generic {
-    int Tcl_UniCharNcasecmp(CONST Tcl_UniChar *ucs, CONST Tcl_UniChar *uct,
+    int Tcl_UniCharNcasecmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct,
 	    unsigned long numChars)
 }
 declare 420 generic {
-    int Tcl_UniCharCaseMatch(CONST Tcl_UniChar *uniStr,
-	    CONST Tcl_UniChar *uniPattern, int nocase)
+    int Tcl_UniCharCaseMatch(const Tcl_UniChar *uniStr,
+	    const Tcl_UniChar *uniPattern, int nocase)
 }
 declare 421 generic {
-    Tcl_HashEntry *Tcl_FindHashEntry(Tcl_HashTable *tablePtr, CONST char *key)
+    Tcl_HashEntry *Tcl_FindHashEntry(Tcl_HashTable *tablePtr, const char *key)
 }
 declare 422 generic {
     Tcl_HashEntry *Tcl_CreateHashEntry(Tcl_HashTable *tablePtr,
-	    CONST char *key, int *newPtr)
+	    const char *key, int *newPtr)
 }
 declare 423 generic {
     void Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr, int keyType,
-	    CONST Tcl_HashKeyType *typePtr)
+	    const Tcl_HashKeyType *typePtr)
 }
 declare 424 generic {
     void Tcl_InitObjHashTable(Tcl_HashTable *tablePtr)
 }
 declare 425 generic {
-    ClientData Tcl_CommandTraceInfo(Tcl_Interp *interp, CONST char *varName,
+    ClientData Tcl_CommandTraceInfo(Tcl_Interp *interp, const char *varName,
 	    int flags, Tcl_CommandTraceProc *procPtr,
 	    ClientData prevClientData)
 }
 declare 426 generic {
-    int Tcl_TraceCommand(Tcl_Interp *interp, CONST char *varName, int flags,
+    int Tcl_TraceCommand(Tcl_Interp *interp, const char *varName, int flags,
 	    Tcl_CommandTraceProc *proc, ClientData clientData)
 }
 declare 427 generic {
-    void Tcl_UntraceCommand(Tcl_Interp *interp, CONST char *varName,
+    void Tcl_UntraceCommand(Tcl_Interp *interp, const char *varName,
 	    int flags, Tcl_CommandTraceProc *proc, ClientData clientData)
 }
 declare 428 generic {
     char * Tcl_AttemptAlloc(unsigned int size)
 }
 declare 429 generic {
-    char * Tcl_AttemptDbCkalloc(unsigned int size, CONST char *file, int line)
+    char * Tcl_AttemptDbCkalloc(unsigned int size, const char *file, int line)
 }
 declare 430 generic {
     char * Tcl_AttemptRealloc(char *ptr, unsigned int size)
 }
 declare 431 generic {
     char * Tcl_AttemptDbCkrealloc(char *ptr, unsigned int size,
-	    CONST char *file, int line)
+	    const char *file, int line)
 }
 declare 432 generic {
     int Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, int length)
@@ -1546,12 +1546,12 @@ declare 434 generic {
     Tcl_UniChar * Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr, int *lengthPtr)
 }
 declare 435 generic {
-    int Tcl_GetMathFuncInfo(Tcl_Interp *interp, CONST char *name,
+    int Tcl_GetMathFuncInfo(Tcl_Interp *interp, const char *name,
 	    int *numArgsPtr, Tcl_ValueType **argTypesPtr,
 	    Tcl_MathProc **procPtr, ClientData *clientDataPtr)
 }
 declare 436 generic {
-    Tcl_Obj * Tcl_ListMathFuncs(Tcl_Interp *interp, CONST char *pattern)
+    Tcl_Obj * Tcl_ListMathFuncs(Tcl_Interp *interp, const char *pattern)
 }
 declare 437 generic {
     Tcl_Obj * Tcl_SubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags)
@@ -1578,7 +1578,7 @@ declare 443 generic {
 }
 declare 444 generic {
     int	Tcl_FSLoadFile(Tcl_Interp * interp,
-	    Tcl_Obj *pathPtr, CONST char * sym1, CONST char * sym2,
+	    Tcl_Obj *pathPtr, const char * sym1, const char * sym2,
 	    Tcl_PackageInitProc ** proc1Ptr,
 	    Tcl_PackageInitProc ** proc2Ptr,
 	    Tcl_LoadHandle * handlePtr,
@@ -1586,7 +1586,7 @@ declare 444 generic {
 }
 declare 445 generic {
     int	Tcl_FSMatchInDirectory(Tcl_Interp *interp, Tcl_Obj *result,
-	    Tcl_Obj *pathPtr, CONST char *pattern, Tcl_GlobTypeData *types)
+	    Tcl_Obj *pathPtr, const char *pattern, Tcl_GlobTypeData *types)
 }
 declare 446 generic {
     Tcl_Obj * Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr, int linkAction)
@@ -1613,7 +1613,7 @@ declare 452 generic {
 	    int index, Tcl_Obj *pathPtr, Tcl_Obj *objPtr)
 }
 declare 453 generic {
-    CONST char *CONST86 * Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef)
+    const char *CONST86 * Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef)
 }
 declare 454 generic {
     int Tcl_FSStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf)
@@ -1623,7 +1623,7 @@ declare 455 generic {
 }
 declare 456 generic {
     Tcl_Channel Tcl_FSOpenFileChannel(Tcl_Interp *interp, Tcl_Obj *pathPtr,
-	    CONST char *modeString, int permissions)
+	    const char *modeString, int permissions)
 }
 declare 457 generic {
     Tcl_Obj*  Tcl_FSGetCwd(Tcl_Interp *interp)
@@ -1648,11 +1648,11 @@ declare 463 generic {
 }
 declare 464 generic {
     Tcl_Obj* Tcl_FSJoinToPath(Tcl_Obj *pathPtr, int objc,
-	    Tcl_Obj *CONST objv[])
+	    Tcl_Obj *const objv[])
 }
 declare 465 generic {
     ClientData Tcl_FSGetInternalRep(Tcl_Obj* pathPtr,
-	    CONST Tcl_Filesystem *fsPtr)
+	    const Tcl_Filesystem *fsPtr)
 }
 declare 466 generic {
     Tcl_Obj* Tcl_FSGetTranslatedPath(Tcl_Interp *interp, Tcl_Obj* pathPtr)
@@ -1661,11 +1661,11 @@ declare 467 generic {
     int Tcl_FSEvalFile(Tcl_Interp *interp, Tcl_Obj *fileName)
 }
 declare 468 generic {
-    Tcl_Obj* Tcl_FSNewNativePath(CONST Tcl_Filesystem* fromFilesystem,
+    Tcl_Obj* Tcl_FSNewNativePath(const Tcl_Filesystem* fromFilesystem,
 	    ClientData clientData)
 }
 declare 469 generic {
-    CONST char* Tcl_FSGetNativePath(Tcl_Obj* pathPtr)
+    const char* Tcl_FSGetNativePath(Tcl_Obj* pathPtr)
 }
 declare 470 generic {
     Tcl_Obj* Tcl_FSFileSystemInfo(Tcl_Obj* pathPtr)
@@ -1677,16 +1677,16 @@ declare 472 generic {
     Tcl_Obj* Tcl_FSListVolumes(void)
 }
 declare 473 generic {
-    int Tcl_FSRegister(ClientData clientData, CONST Tcl_Filesystem *fsPtr)
+    int Tcl_FSRegister(ClientData clientData, const Tcl_Filesystem *fsPtr)
 }
 declare 474 generic {
-    int Tcl_FSUnregister(CONST Tcl_Filesystem *fsPtr)
+    int Tcl_FSUnregister(const Tcl_Filesystem *fsPtr)
 }
 declare 475 generic {
-    ClientData Tcl_FSData(CONST Tcl_Filesystem *fsPtr)
+    ClientData Tcl_FSData(const Tcl_Filesystem *fsPtr)
 }
 declare 476 generic {
-    CONST char* Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp,
+    const char* Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp,
 	    Tcl_Obj* pathPtr)
 }
 declare 477 generic {
@@ -1700,7 +1700,7 @@ declare 479 generic {
     int Tcl_OutputBuffered(Tcl_Channel chan)
 }
 declare 480 generic {
-    void Tcl_FSMountsChanged(CONST Tcl_Filesystem *fsPtr)
+    void Tcl_FSMountsChanged(const Tcl_Filesystem *fsPtr)
 }
 # New function due to TIP#56
 declare 481 generic {
@@ -1725,13 +1725,13 @@ declare 484 generic {
 }
 declare 485 generic {
     int Tcl_SetCommandInfoFromToken(Tcl_Command token,
-	    CONST Tcl_CmdInfo* infoPtr)
+	    const Tcl_CmdInfo* infoPtr)
 }
 
 ### New functions on 64-bit dev branch ###
 declare 486 generic {
     Tcl_Obj * Tcl_DbNewWideIntObj(Tcl_WideInt wideValue,
-	    CONST char *file, int line)
+	    const char *file, int line)
 }
 declare 487 generic {
     int Tcl_GetWideIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -1756,7 +1756,7 @@ declare 492 generic {
 # New export due to TIP#91
 declare 493 generic {
     Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 
 # DICTIONARIES - TIP#111
@@ -1789,28 +1789,28 @@ declare 500 generic {
 }
 declare 501 generic {
     int Tcl_DictObjPutKeyList(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-	    int keyc, Tcl_Obj *CONST *keyv, Tcl_Obj *valuePtr)
+	    int keyc, Tcl_Obj *const *keyv, Tcl_Obj *valuePtr)
 }
 declare 502 generic {
     int Tcl_DictObjRemoveKeyList(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-	    int keyc, Tcl_Obj *CONST *keyv)
+	    int keyc, Tcl_Obj *const *keyv)
 }
 declare 503 generic {
     Tcl_Obj *Tcl_NewDictObj(void)
 }
 declare 504 generic {
-    Tcl_Obj *Tcl_DbNewDictObj(CONST char *file, int line)
+    Tcl_Obj *Tcl_DbNewDictObj(const char *file, int line)
 }
 
 # New export due to TIP#59
 declare 505 generic {
-    void Tcl_RegisterConfig(Tcl_Interp* interp, CONST char* pkgName,
-	    CONST Tcl_Config* configuration, CONST char* valEncoding)
+    void Tcl_RegisterConfig(Tcl_Interp* interp, const char* pkgName,
+	    const Tcl_Config* configuration, const char* valEncoding)
 }
 
 # Transferred from tclInt.decls due to TIP #139
 declare 506 generic {
-    Tcl_Namespace *Tcl_CreateNamespace(Tcl_Interp *interp, CONST char *name,
+    Tcl_Namespace *Tcl_CreateNamespace(Tcl_Interp *interp, const char *name,
 	    ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc)
 }
 declare 507 generic {
@@ -1822,15 +1822,15 @@ declare 508 generic {
 }
 declare 509 generic {
     int Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
-	    CONST char *pattern, int resetListFirst)
+	    const char *pattern, int resetListFirst)
 }
 declare 510 generic {
     int Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
-	    CONST char *pattern, int allowOverwrite)
+	    const char *pattern, int allowOverwrite)
 }
 declare 511 generic {
     int Tcl_ForgetImport(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
-	    CONST char *pattern)
+	    const char *pattern)
 }
 declare 512 generic {
     Tcl_Namespace *Tcl_GetCurrentNamespace(Tcl_Interp *interp)
@@ -1839,11 +1839,11 @@ declare 513 generic {
     Tcl_Namespace *Tcl_GetGlobalNamespace(Tcl_Interp *interp)
 }
 declare 514 generic {
-    Tcl_Namespace *Tcl_FindNamespace(Tcl_Interp *interp, CONST char *name,
+    Tcl_Namespace *Tcl_FindNamespace(Tcl_Interp *interp, const char *name,
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
 declare 515 generic {
-    Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, CONST char *name,
+    Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, const char *name,
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
 declare 516 generic {
@@ -1857,7 +1857,7 @@ declare 517 generic {
 # New export due to TIP#137
 declare 518 generic {
     int Tcl_FSEvalFileEx(Tcl_Interp *interp, Tcl_Obj *fileName,
-            CONST char *encodingName)
+            const char *encodingName)
 }
 
 # New export due to TIP#121
@@ -1936,7 +1936,7 @@ declare 540 generic {
     int Tcl_IsEnsemble(Tcl_Command token)
 }
 declare 541 generic {
-    Tcl_Command Tcl_CreateEnsemble(Tcl_Interp *interp, CONST char *name,
+    Tcl_Command Tcl_CreateEnsemble(Tcl_Interp *interp, const char *name,
 	    Tcl_Namespace *namespacePtr, int flags)
 }
 declare 542 generic {
@@ -1992,7 +1992,7 @@ declare 553 generic {
 # TIP#218 (Driver Thread Actions) davygrvy/akupries ChannelType ver 4
 declare 554 generic {
     Tcl_DriverThreadActionProc *Tcl_ChannelThreadActionProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 
 # TIP#237 (Arbitrary-precision Integers) kevin kenny
@@ -2001,7 +2001,7 @@ declare 555 generic {
     Tcl_Obj* Tcl_NewBignumObj(mp_int* value)
 }
 declare 556 generic {
-    Tcl_Obj* Tcl_DbNewBignumObj(mp_int* value, CONST char* file, int line)
+    Tcl_Obj* Tcl_DbNewBignumObj(mp_int* value, const char* file, int line)
 }
 declare 557 generic {
     void Tcl_SetBignumObj(Tcl_Obj* obj, mp_int* value)
@@ -2019,7 +2019,7 @@ declare 560 generic {
 }
 declare 561 generic {
     Tcl_DriverTruncateProc *Tcl_ChannelTruncateProc(
-	    CONST Tcl_ChannelType *chanTypePtr)
+	    const Tcl_ChannelType *chanTypePtr)
 }
 
 # TIP#219 (Tcl Channel Reflection API) akupries
@@ -2068,13 +2068,13 @@ declare 571 generic {
     int Tcl_SetEncodingSearchPath(Tcl_Obj* searchPath)
 }
 declare 572 generic {
-    CONST char *Tcl_GetEncodingNameFromEnvironment(Tcl_DString* bufPtr)
+    const char *Tcl_GetEncodingNameFromEnvironment(Tcl_DString* bufPtr)
 }
 
 # TIP#268: Extended version numbers and requirements
 declare 573 generic {
-    int Tcl_PkgRequireProc(Tcl_Interp *interp, CONST char *name,
-	    int objc, Tcl_Obj *CONST objv[], ClientData *clientDataPtr)
+    int Tcl_PkgRequireProc(Tcl_Interp *interp, const char *name,
+	    int objc, Tcl_Obj *const objv[], ClientData *clientDataPtr)
 }
 
 # TIP#270 Utility C Routines for String Formatting
@@ -2082,22 +2082,22 @@ declare 574 generic {
     void Tcl_AppendObjToErrorInfo(Tcl_Interp *interp, Tcl_Obj *objPtr)
 }
 declare 575 generic {
-    void Tcl_AppendLimitedToObj(Tcl_Obj *objPtr, CONST char *bytes, int length,
-	    int limit, CONST char *ellipsis)
+    void Tcl_AppendLimitedToObj(Tcl_Obj *objPtr, const char *bytes, int length,
+	    int limit, const char *ellipsis)
 }
 declare 576 generic {
-    Tcl_Obj * Tcl_Format(Tcl_Interp *interp, CONST char *format, int objc,
-	    Tcl_Obj * CONST objv[])
+    Tcl_Obj * Tcl_Format(Tcl_Interp *interp, const char *format, int objc,
+	    Tcl_Obj * const objv[])
 }
 declare 577 generic {
     int Tcl_AppendFormatToObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    CONST char *format, int objc, Tcl_Obj * CONST objv[])
+	    const char *format, int objc, Tcl_Obj * const objv[])
 }
 declare 578 generic {
-    Tcl_Obj * Tcl_ObjPrintf(CONST char *format, ...)
+    Tcl_Obj * Tcl_ObjPrintf(const char *format, ...)
 }
 declare 579 generic {
-    void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, CONST char *format, ...)
+    void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, const char *format, ...)
 }
 
 # TIP #285: Script cancellation support.
@@ -2117,34 +2117,34 @@ declare 582 generic {
 
 # TIP #322 (NRE public interface)
 declare 583 generic {
-    Tcl_Command Tcl_NRCreateCommand(Tcl_Interp *interp, 
-		    CONST char *cmdName, Tcl_ObjCmdProc *proc, 
-	            Tcl_ObjCmdProc *nreProc, ClientData clientData, 
+    Tcl_Command Tcl_NRCreateCommand(Tcl_Interp *interp,
+		    const char *cmdName, Tcl_ObjCmdProc *proc,
+	            Tcl_ObjCmdProc *nreProc, ClientData clientData,
 		    Tcl_CmdDeleteProc *deleteProc)
 }
 declare 584 generic {
     int Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags)
 }
 declare 585 generic {
-    int Tcl_NREvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
+    int Tcl_NREvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
 	    int flags)
 }
 declare 586 generic {
-    int Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd, int objc, 
-                      Tcl_Obj *CONST objv[], int flags)
+    int Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd, int objc,
+                      Tcl_Obj *const objv[], int flags)
 }
 declare 587 generic {
-    void Tcl_NRAddCallback(Tcl_Interp *interp, Tcl_NRPostProc *postProcPtr, 
+    void Tcl_NRAddCallback(Tcl_Interp *interp, Tcl_NRPostProc *postProcPtr,
                       ClientData data0, ClientData data1,
                       ClientData data2, ClientData data3)
 }
 
 # For use by NR extenders, to have a simple way to also provide a (required!)
-# classic objProc 
+# classic objProc
 declare 588 generic {
     int Tcl_NRCallObjProc(Tcl_Interp *interp, Tcl_ObjCmdProc *objProc,
 			  ClientData clientData, int objc,
-	                     Tcl_Obj *CONST objv[])
+	                     Tcl_Obj *const objv[])
 }
 
 # Tcl_StatBuf reader functions. [TIP #316]
@@ -2221,10 +2221,10 @@ interface tclPlat
 # Added in Tcl 8.1
 
 declare 0 win {
-    TCHAR * Tcl_WinUtfToTChar(CONST char *str, int len, Tcl_DString *dsPtr)
+    TCHAR * Tcl_WinUtfToTChar(const char *str, int len, Tcl_DString *dsPtr)
 }
 declare 1 win {
-    char * Tcl_WinTCharToUtf(CONST TCHAR *str, int len, Tcl_DString *dsPtr)
+    char * Tcl_WinTCharToUtf(const TCHAR *str, int len, Tcl_DString *dsPtr)
 }
 
 ################################
@@ -2232,15 +2232,15 @@ declare 1 win {
 
 declare 0 macosx {
     int Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
-	    CONST char *bundleName,
+	    const char *bundleName,
 	    int hasResourceFile,
 	    int maxPathLen,
 	    char *libraryPath)
 }
 declare 1 macosx {
     int Tcl_MacOSXOpenVersionedBundleResources(Tcl_Interp *interp,
-	    CONST char *bundleName,
-	    CONST char *bundleVersion,
+	    const char *bundleName,
+	    const char *bundleVersion,
 	    int hasResourceFile,
 	    int maxPathLen,
 	    char *libraryPath)
@@ -2255,7 +2255,7 @@ export {
     void Tcl_Main(int argc, char **argv, Tcl_AppInitProc *appInitProc)
 }
 export {
-    CONST char *Tcl_PkgInitStubsCheck(Tcl_Interp *interp, CONST char *version,
+    const char *Tcl_PkgInitStubsCheck(Tcl_Interp *interp, const char *version,
 	int exact)
 }
 export {
diff --git a/generic/tcl.h b/generic/tcl.h
index d081eb5..b418aa7 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.276 2008/10/14 20:08:20 dgp Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.277 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 #ifndef _TCL
@@ -240,15 +240,17 @@ extern "C" {
  * ANSI C features.
  */
 
-#undef CONST
 #ifndef INLINE
 #   define INLINE
 #endif
 
-#ifndef NO_CONST
+#ifdef NO_CONST
+#   ifndef const
+#      define const
+#   endif
+#endif
+#ifndef CONST
 #   define CONST const
-#else
-#   define CONST
 #endif
 
 #ifdef USE_NON_CONST
@@ -260,10 +262,10 @@ extern "C" {
 #else
 #   ifdef USE_COMPAT_CONST
 #      define CONST84
-#      define CONST84_RETURN CONST
+#      define CONST84_RETURN const
 #   else
-#      define CONST84 CONST
-#      define CONST84_RETURN CONST
+#      define CONST84 const
+#      define CONST84_RETURN const
 #   endif
 #endif
 
@@ -673,12 +675,12 @@ typedef void (Tcl_CmdTraceProc) (ClientData clientData, Tcl_Interp *interp,
 	int level, char *command, Tcl_CmdProc *proc,
 	ClientData cmdClientData, int argc, CONST84 char *argv[]);
 typedef int (Tcl_CmdObjTraceProc) (ClientData clientData, Tcl_Interp *interp,
-	int level, CONST char *command, Tcl_Command commandInfo, int objc,
-	struct Tcl_Obj * CONST * objv);
+	int level, const char *command, Tcl_Command commandInfo, int objc,
+	struct Tcl_Obj * const* objv);
 typedef void (Tcl_CmdObjTraceDeleteProc) (ClientData clientData);
 typedef void (Tcl_DupInternalRepProc) (struct Tcl_Obj *srcPtr,
 	struct Tcl_Obj *dupPtr);
-typedef int (Tcl_EncodingConvertProc) (ClientData clientData, CONST char *src,
+typedef int (Tcl_EncodingConvertProc) (ClientData clientData, const char *src,
 	int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst,
 	int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr);
 typedef void (Tcl_EncodingFreeProc) (ClientData clientData);
@@ -698,10 +700,10 @@ typedef int (Tcl_MathProc) (ClientData clientData, Tcl_Interp *interp,
 	Tcl_Value *args, Tcl_Value *resultPtr);
 typedef void (Tcl_NamespaceDeleteProc) (ClientData clientData);
 typedef int (Tcl_ObjCmdProc) (ClientData clientData, Tcl_Interp *interp,
-	int objc, struct Tcl_Obj * CONST * objv);
+	int objc, struct Tcl_Obj * const* objv);
 typedef int (Tcl_PackageInitProc) (Tcl_Interp *interp);
 typedef int (Tcl_PackageUnloadProc) (Tcl_Interp *interp, int flags);
-typedef void (Tcl_PanicProc) (CONST char *format, ...);
+typedef void (Tcl_PanicProc) (const char *format, ...);
 typedef void (Tcl_TcpAcceptProc) (ClientData callbackData, Tcl_Channel chan,
 	char *address, int port);
 typedef void (Tcl_TimerProc) (ClientData clientData);
@@ -710,7 +712,7 @@ typedef void (Tcl_UpdateStringProc) (struct Tcl_Obj *objPtr);
 typedef char *(Tcl_VarTraceProc) (ClientData clientData, Tcl_Interp *interp,
 	CONST84 char *part1, CONST84 char *part2, int flags);
 typedef void (Tcl_CommandTraceProc) (ClientData clientData, Tcl_Interp *interp,
-	CONST char *oldName, CONST char *newName, int flags);
+	const char *oldName, const char *newName, int flags);
 typedef void (Tcl_CreateFileHandlerProc) (int fd, int mask, Tcl_FileProc *proc,
 	ClientData clientData);
 typedef void (Tcl_DeleteFileHandlerProc) (int fd);
@@ -727,7 +729,7 @@ typedef void (Tcl_MainLoopProc) (void);
  */
 
 typedef struct Tcl_ObjType {
-    CONST char *name;			/* Name of the type, e.g. "int". */
+    const char *name;			/* Name of the type, e.g. "int". */
     Tcl_FreeInternalRepProc *freeIntRepProc;
 				/* Called to free any storage for the type's
 				 * internal rep. NULL if the internal rep does
@@ -765,7 +767,7 @@ typedef struct Tcl_Obj {
 				 * array as a readonly value. */
     int length;			/* The number of bytes at *bytes, not
 				 * including the terminating null. */
-    CONST Tcl_ObjType *typePtr;	/* Denotes the object's type. Always
+    const Tcl_ObjType *typePtr;	/* Denotes the object's type. Always
 				 * corresponds to the type of the object's
 				 * internal rep. NULL indicates the object has
 				 * no internal rep (has no type). */
@@ -1233,8 +1235,8 @@ struct Tcl_HashTable {
 				 * TCL_ONE_WORD_KEYS, or an integer giving the
 				 * number of ints that is the size of the
 				 * key. */
-    Tcl_HashEntry *(*findProc) (Tcl_HashTable *tablePtr, CONST char *key);
-    Tcl_HashEntry *(*createProc) (Tcl_HashTable *tablePtr, CONST char *key,
+    Tcl_HashEntry *(*findProc) (Tcl_HashTable *tablePtr, const char *key);
+    Tcl_HashEntry *(*createProc) (Tcl_HashTable *tablePtr, const char *key,
 	    int *newPtr);
     const Tcl_HashKeyType *typePtr;	/* Type of the keys used in the
 				 * Tcl_HashTable. */
@@ -1424,8 +1426,8 @@ typedef int	(Tcl_DriverOutputProc) (ClientData instanceData,
 typedef int	(Tcl_DriverSeekProc) (ClientData instanceData, long offset,
 			int mode, int *errorCodePtr);
 typedef int	(Tcl_DriverSetOptionProc) (ClientData instanceData,
-			Tcl_Interp *interp, CONST char *optionName,
-			CONST char *value);
+			Tcl_Interp *interp, const char *optionName,
+			const char *value);
 typedef int	(Tcl_DriverGetOptionProc) (ClientData instanceData,
 			Tcl_Interp *interp, CONST84 char *optionName,
 			Tcl_DString *dsPtr);
@@ -1460,7 +1462,7 @@ typedef int	(Tcl_DriverTruncateProc) (ClientData instanceData,
  */
 
 typedef struct Tcl_ChannelType {
-    CONST char *typeName; /* The name of the channel type in Tcl
+    const char *typeName; /* The name of the channel type in Tcl
 				 * commands. This storage is owned by channel
 				 * type. */
     Tcl_ChannelTypeVersion version;
@@ -1597,7 +1599,7 @@ typedef int (Tcl_FSAccessProc) (Tcl_Obj *pathPtr, int mode);
 typedef Tcl_Channel (Tcl_FSOpenFileChannelProc) (Tcl_Interp *interp,
 	Tcl_Obj *pathPtr, int mode, int permissions);
 typedef int (Tcl_FSMatchInDirectoryProc) (Tcl_Interp *interp, Tcl_Obj *result,
-	Tcl_Obj *pathPtr, CONST char *pattern, Tcl_GlobTypeData * types);
+	Tcl_Obj *pathPtr, const char *pattern, Tcl_GlobTypeData * types);
 typedef Tcl_Obj * (Tcl_FSGetCwdProc) (Tcl_Interp *interp);
 typedef int (Tcl_FSChdirProc) (Tcl_Obj *pathPtr);
 typedef int (Tcl_FSLstatProc) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
@@ -1618,7 +1620,7 @@ typedef int (Tcl_FSNormalizePathProc) (Tcl_Interp *interp, Tcl_Obj *pathPtr,
 	int nextCheckpoint);
 typedef int (Tcl_FSFileAttrsGetProc) (Tcl_Interp *interp, int index,
 	Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef);
-typedef CONST char *CONST86 * (Tcl_FSFileAttrStringsProc) (Tcl_Obj *pathPtr,
+typedef const char *CONST86 * (Tcl_FSFileAttrStringsProc) (Tcl_Obj *pathPtr,
 	Tcl_Obj **objPtrRef);
 typedef int (Tcl_FSFileAttrsSetProc) (Tcl_Interp *interp, int index,
 	Tcl_Obj *pathPtr, Tcl_Obj *objPtr);
@@ -1662,7 +1664,7 @@ typedef struct Tcl_FSVersion_ *Tcl_FSVersion;
  */
 
 typedef struct Tcl_Filesystem {
-    CONST char *typeName;	/* The name of the filesystem. */
+    const char *typeName;	/* The name of the filesystem. */
     int structureLength;	/* Length of this structure, so future binary
 				 * compatibility can be assured. */
     Tcl_FSVersion version;	/* Version of the filesystem type. */
@@ -1845,7 +1847,7 @@ typedef struct Tcl_NotifierProcs {
  */
 
 typedef struct Tcl_EncodingType {
-    CONST char *encodingName;	/* The name of the encoding, e.g. "euc-jp".
+    const char *encodingName;	/* The name of the encoding, e.g. "euc-jp".
 				 * This name is the unique key for this
 				 * encoding type. */
     Tcl_EncodingConvertProc *toUtfProc;
@@ -1913,7 +1915,7 @@ typedef struct Tcl_EncodingType {
 typedef struct Tcl_Token {
     int type;			/* Type of token, such as TCL_TOKEN_WORD; see
 				 * below for valid types. */
-    CONST char *start;		/* First character in token. */
+    const char *start;		/* First character in token. */
     int size;			/* Number of bytes in token. */
     int numComponents;		/* If this token is composed of other tokens,
 				 * this field tells how many of them there are
@@ -2027,13 +2029,13 @@ typedef struct Tcl_Token {
 #define NUM_STATIC_TOKENS 20
 
 typedef struct Tcl_Parse {
-    CONST char *commentStart;	/* Pointer to # that begins the first of one
+    const char *commentStart;	/* Pointer to # that begins the first of one
 				 * or more comments preceding the command. */
     int commentSize;		/* Number of bytes in comments (up through
 				 * newline character that terminates the last
 				 * comment). If there were no comments, this
 				 * field is 0. */
-    CONST char *commandStart;	/* First character in first word of
+    const char *commandStart;	/* First character in first word of
 				 * command. */
     int commandSize;		/* Number of bytes in command, including first
 				 * character of first word, up through the
@@ -2057,13 +2059,13 @@ typedef struct Tcl_Parse {
      * They should not be used by functions that invoke Tcl_ParseCommand.
      */
 
-    CONST char *string;		/* The original command string passed to
+    const char *string;		/* The original command string passed to
 				 * Tcl_ParseCommand. */
-    CONST char *end;		/* Points to the character just after the last
+    const char *end;		/* Points to the character just after the last
 				 * one in the command string. */
     Tcl_Interp *interp;		/* Interpreter to use for error reporting, or
 				 * NULL. */
-    CONST char *term;		/* Points to character in string that
+    const char *term;		/* Points to character in string that
 				 * terminated most recent token. Filled in by
 				 * ParseTokens. If an error occurs, points to
 				 * beginning of region where the error
@@ -2154,9 +2156,9 @@ typedef unsigned short Tcl_UniChar;
  */
 
 typedef struct Tcl_Config {
-    CONST char *key;		/* Configuration key to register. ASCII
+    const char *key;		/* Configuration key to register. ASCII
 				 * encoded, thus UTF-8 */
-    CONST char *value;		/* The value associated with the key. System
+    const char *value;		/* The value associated with the key. System
 				 * encoding */
 } Tcl_Config;
 
@@ -2261,10 +2263,10 @@ typedef int (*Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp,
  * main library in case an extension is statically linked into an application.
  */
 
-EXTERN CONST char *	Tcl_InitStubs (Tcl_Interp *interp, CONST char *version,
+EXTERN const char *	Tcl_InitStubs (Tcl_Interp *interp, const char *version,
 				int exact);
-EXTERN CONST char *	TclTomMathInitializeStubs (Tcl_Interp *interp,
-				CONST char *version, int epoch, int revision);
+EXTERN const char *	TclTomMathInitializeStubs (Tcl_Interp *interp,
+				const char *version, int epoch, int revision);
 
 #ifndef USE_TCL_STUBS
 
@@ -2289,8 +2291,8 @@ EXTERN CONST char *	TclTomMathInitializeStubs (Tcl_Interp *interp,
 
 EXTERN void		Tcl_Main (int argc, char **argv,
 				Tcl_AppInitProc *appInitProc);
-EXTERN CONST char *	Tcl_PkgInitStubsCheck (Tcl_Interp *interp,
-				CONST char *version, int exact);
+EXTERN const char *	Tcl_PkgInitStubsCheck (Tcl_Interp *interp,
+				const char *version, int exact);
 #if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
 EXTERN void		Tcl_GetMemoryInfo (Tcl_DString *dsPtr);
 #endif
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 102a9ec..2ef278f 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclCompile.h,v 1.111 2008/10/17 16:32:58 dgp Exp $
+ * RCS: @(#) $Id: tclCompile.h,v 1.112 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 #ifndef _TCLCOMPILATION
@@ -879,7 +879,7 @@ MODULE_SCOPE void	TclCompileTokens(Tcl_Interp *interp,
 			    Tcl_Token *tokenPtr, int count,
 			    CompileEnv *envPtr);
 MODULE_SCOPE int	TclCreateAuxData(ClientData clientData,
-			    CONST AuxDataType *typePtr, CompileEnv *envPtr);
+			    const AuxDataType *typePtr, CompileEnv *envPtr);
 MODULE_SCOPE int	TclCreateExceptRange(ExceptionRangeType type,
 			    CompileEnv *envPtr);
 MODULE_SCOPE ExecEnv *	TclCreateExecEnv(Tcl_Interp *interp);
@@ -930,7 +930,7 @@ MODULE_SCOPE void	TclPrintObject(FILE *outFile,
 			    Tcl_Obj *objPtr, int maxChars);
 MODULE_SCOPE void	TclPrintSource(FILE *outFile,
 			    const char *string, int maxChars);
-MODULE_SCOPE void	TclRegisterAuxDataType(CONST AuxDataType *typePtr);
+MODULE_SCOPE void	TclRegisterAuxDataType(const AuxDataType *typePtr);
 MODULE_SCOPE int	TclRegisterLiteral(CompileEnv *envPtr,
 			    char *bytes, int length, int flags);
 MODULE_SCOPE void	TclReleaseLiteral(Tcl_Interp *interp, Tcl_Obj *objPtr);
@@ -1233,7 +1233,7 @@ MODULE_SCOPE int	TclWordKnownAtCompileTime(Tcl_Token *tokenPtr,
  * If the second macro is defined, logging to file starts immediately,
  * otherwise only after the first call to [tcl::dtrace]. Note that the debug
  * probe data is always computed, even when it is not logged to file.
- * 
+ *
  * Defining the third macro enables debug logging of inst probes (disabled
  * by default due to the significant performance impact).
  */
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 8b7beaa..784f1ca 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclDecls.h,v 1.154 2008/10/05 22:25:35 nijtmans Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.155 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 #ifndef _TCLDECLS
@@ -40,21 +40,21 @@
 #ifndef Tcl_PkgProvideEx_TCL_DECLARED
 #define Tcl_PkgProvideEx_TCL_DECLARED
 /* 0 */
-EXTERN int		Tcl_PkgProvideEx (Tcl_Interp* interp, 
-				CONST char* name, CONST char* version, 
+EXTERN int		Tcl_PkgProvideEx (Tcl_Interp* interp,
+				const char* name, const char* version,
 				ClientData clientData);
 #endif
 #ifndef Tcl_PkgRequireEx_TCL_DECLARED
 #define Tcl_PkgRequireEx_TCL_DECLARED
 /* 1 */
-EXTERN CONST84_RETURN char * Tcl_PkgRequireEx (Tcl_Interp * interp, 
-				CONST char * name, CONST char * version, 
+EXTERN CONST84_RETURN char * Tcl_PkgRequireEx (Tcl_Interp * interp,
+				const char * name, const char * version,
 				int exact, ClientData * clientDataPtr);
 #endif
 #ifndef Tcl_Panic_TCL_DECLARED
 #define Tcl_Panic_TCL_DECLARED
 /* 2 */
-EXTERN void		Tcl_Panic (CONST char * format, ...);
+EXTERN void		Tcl_Panic (const char * format, ...);
 #endif
 #ifndef Tcl_Alloc_TCL_DECLARED
 #define Tcl_Alloc_TCL_DECLARED
@@ -74,26 +74,26 @@ EXTERN char *		Tcl_Realloc (char * ptr, unsigned int size);
 #ifndef Tcl_DbCkalloc_TCL_DECLARED
 #define Tcl_DbCkalloc_TCL_DECLARED
 /* 6 */
-EXTERN char *		Tcl_DbCkalloc (unsigned int size, CONST char * file, 
+EXTERN char *		Tcl_DbCkalloc (unsigned int size, const char * file,
 				int line);
 #endif
 #ifndef Tcl_DbCkfree_TCL_DECLARED
 #define Tcl_DbCkfree_TCL_DECLARED
 /* 7 */
-EXTERN int		Tcl_DbCkfree (char * ptr, CONST char * file, 
+EXTERN int		Tcl_DbCkfree (char * ptr, const char * file,
 				int line);
 #endif
 #ifndef Tcl_DbCkrealloc_TCL_DECLARED
 #define Tcl_DbCkrealloc_TCL_DECLARED
 /* 8 */
-EXTERN char *		Tcl_DbCkrealloc (char * ptr, unsigned int size, 
-				CONST char * file, int line);
+EXTERN char *		Tcl_DbCkrealloc (char * ptr, unsigned int size,
+				const char * file, int line);
 #endif
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
 #ifndef Tcl_CreateFileHandler_TCL_DECLARED
 #define Tcl_CreateFileHandler_TCL_DECLARED
 /* 9 */
-EXTERN void		Tcl_CreateFileHandler (int fd, int mask, 
+EXTERN void		Tcl_CreateFileHandler (int fd, int mask,
 				Tcl_FileProc * proc, ClientData clientData);
 #endif
 #endif /* UNIX */
@@ -101,7 +101,7 @@ EXTERN void		Tcl_CreateFileHandler (int fd, int mask,
 #ifndef Tcl_CreateFileHandler_TCL_DECLARED
 #define Tcl_CreateFileHandler_TCL_DECLARED
 /* 9 */
-EXTERN void		Tcl_CreateFileHandler (int fd, int mask, 
+EXTERN void		Tcl_CreateFileHandler (int fd, int mask,
 				Tcl_FileProc * proc, ClientData clientData);
 #endif
 #endif /* MACOSX */
@@ -122,7 +122,7 @@ EXTERN void		Tcl_DeleteFileHandler (int fd);
 #ifndef Tcl_SetTimer_TCL_DECLARED
 #define Tcl_SetTimer_TCL_DECLARED
 /* 11 */
-EXTERN void		Tcl_SetTimer (CONST Tcl_Time * timePtr);
+EXTERN void		Tcl_SetTimer (const Tcl_Time * timePtr);
 #endif
 #ifndef Tcl_Sleep_TCL_DECLARED
 #define Tcl_Sleep_TCL_DECLARED
@@ -132,12 +132,12 @@ EXTERN void		Tcl_Sleep (int ms);
 #ifndef Tcl_WaitForEvent_TCL_DECLARED
 #define Tcl_WaitForEvent_TCL_DECLARED
 /* 13 */
-EXTERN int		Tcl_WaitForEvent (CONST Tcl_Time * timePtr);
+EXTERN int		Tcl_WaitForEvent (const Tcl_Time * timePtr);
 #endif
 #ifndef Tcl_AppendAllObjTypes_TCL_DECLARED
 #define Tcl_AppendAllObjTypes_TCL_DECLARED
 /* 14 */
-EXTERN int		Tcl_AppendAllObjTypes (Tcl_Interp * interp, 
+EXTERN int		Tcl_AppendAllObjTypes (Tcl_Interp * interp,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_AppendStringsToObj_TCL_DECLARED
@@ -148,79 +148,79 @@ EXTERN void		Tcl_AppendStringsToObj (Tcl_Obj * objPtr, ...);
 #ifndef Tcl_AppendToObj_TCL_DECLARED
 #define Tcl_AppendToObj_TCL_DECLARED
 /* 16 */
-EXTERN void		Tcl_AppendToObj (Tcl_Obj* objPtr, CONST char* bytes, 
+EXTERN void		Tcl_AppendToObj (Tcl_Obj* objPtr, const char* bytes,
 				int length);
 #endif
 #ifndef Tcl_ConcatObj_TCL_DECLARED
 #define Tcl_ConcatObj_TCL_DECLARED
 /* 17 */
-EXTERN Tcl_Obj *	Tcl_ConcatObj (int objc, Tcl_Obj *CONST objv[]);
+EXTERN Tcl_Obj *	Tcl_ConcatObj (int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_ConvertToType_TCL_DECLARED
 #define Tcl_ConvertToType_TCL_DECLARED
 /* 18 */
-EXTERN int		Tcl_ConvertToType (Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, 
-				CONST Tcl_ObjType * typePtr);
+EXTERN int		Tcl_ConvertToType (Tcl_Interp * interp,
+				Tcl_Obj * objPtr,
+				const Tcl_ObjType * typePtr);
 #endif
 #ifndef Tcl_DbDecrRefCount_TCL_DECLARED
 #define Tcl_DbDecrRefCount_TCL_DECLARED
 /* 19 */
-EXTERN void		Tcl_DbDecrRefCount (Tcl_Obj * objPtr, 
-				CONST char * file, int line);
+EXTERN void		Tcl_DbDecrRefCount (Tcl_Obj * objPtr,
+				const char * file, int line);
 #endif
 #ifndef Tcl_DbIncrRefCount_TCL_DECLARED
 #define Tcl_DbIncrRefCount_TCL_DECLARED
 /* 20 */
-EXTERN void		Tcl_DbIncrRefCount (Tcl_Obj * objPtr, 
-				CONST char * file, int line);
+EXTERN void		Tcl_DbIncrRefCount (Tcl_Obj * objPtr,
+				const char * file, int line);
 #endif
 #ifndef Tcl_DbIsShared_TCL_DECLARED
 #define Tcl_DbIsShared_TCL_DECLARED
 /* 21 */
-EXTERN int		Tcl_DbIsShared (Tcl_Obj * objPtr, CONST char * file, 
+EXTERN int		Tcl_DbIsShared (Tcl_Obj * objPtr, const char * file,
 				int line);
 #endif
 #ifndef Tcl_DbNewBooleanObj_TCL_DECLARED
 #define Tcl_DbNewBooleanObj_TCL_DECLARED
 /* 22 */
-EXTERN Tcl_Obj *	Tcl_DbNewBooleanObj (int boolValue, 
-				CONST char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewBooleanObj (int boolValue,
+				const char * file, int line);
 #endif
 #ifndef Tcl_DbNewByteArrayObj_TCL_DECLARED
 #define Tcl_DbNewByteArrayObj_TCL_DECLARED
 /* 23 */
-EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj (CONST unsigned char * bytes, 
-				int length, CONST char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj (const unsigned char * bytes,
+				int length, const char * file, int line);
 #endif
 #ifndef Tcl_DbNewDoubleObj_TCL_DECLARED
 #define Tcl_DbNewDoubleObj_TCL_DECLARED
 /* 24 */
-EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj (double doubleValue, 
-				CONST char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj (double doubleValue,
+				const char * file, int line);
 #endif
 #ifndef Tcl_DbNewListObj_TCL_DECLARED
 #define Tcl_DbNewListObj_TCL_DECLARED
 /* 25 */
-EXTERN Tcl_Obj *	Tcl_DbNewListObj (int objc, Tcl_Obj *CONST * objv, 
-				CONST char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewListObj (int objc, Tcl_Obj *const * objv,
+				const char * file, int line);
 #endif
 #ifndef Tcl_DbNewLongObj_TCL_DECLARED
 #define Tcl_DbNewLongObj_TCL_DECLARED
 /* 26 */
-EXTERN Tcl_Obj *	Tcl_DbNewLongObj (long longValue, CONST char * file, 
+EXTERN Tcl_Obj *	Tcl_DbNewLongObj (long longValue, const char * file,
 				int line);
 #endif
 #ifndef Tcl_DbNewObj_TCL_DECLARED
 #define Tcl_DbNewObj_TCL_DECLARED
 /* 27 */
-EXTERN Tcl_Obj *	Tcl_DbNewObj (CONST char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewObj (const char * file, int line);
 #endif
 #ifndef Tcl_DbNewStringObj_TCL_DECLARED
 #define Tcl_DbNewStringObj_TCL_DECLARED
 /* 28 */
-EXTERN Tcl_Obj *	Tcl_DbNewStringObj (CONST char * bytes, int length, 
-				CONST char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewStringObj (const char * bytes, int length,
+				const char * file, int line);
 #endif
 #ifndef Tcl_DuplicateObj_TCL_DECLARED
 #define Tcl_DuplicateObj_TCL_DECLARED
@@ -235,68 +235,68 @@ EXTERN void		TclFreeObj (Tcl_Obj * objPtr);
 #ifndef Tcl_GetBoolean_TCL_DECLARED
 #define Tcl_GetBoolean_TCL_DECLARED
 /* 31 */
-EXTERN int		Tcl_GetBoolean (Tcl_Interp * interp, 
-				CONST char * src, int * boolPtr);
+EXTERN int		Tcl_GetBoolean (Tcl_Interp * interp,
+				const char * src, int * boolPtr);
 #endif
 #ifndef Tcl_GetBooleanFromObj_TCL_DECLARED
 #define Tcl_GetBooleanFromObj_TCL_DECLARED
 /* 32 */
-EXTERN int		Tcl_GetBooleanFromObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetBooleanFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, int * boolPtr);
 #endif
 #ifndef Tcl_GetByteArrayFromObj_TCL_DECLARED
 #define Tcl_GetByteArrayFromObj_TCL_DECLARED
 /* 33 */
-EXTERN unsigned char *	Tcl_GetByteArrayFromObj (Tcl_Obj * objPtr, 
+EXTERN unsigned char *	Tcl_GetByteArrayFromObj (Tcl_Obj * objPtr,
 				int * lengthPtr);
 #endif
 #ifndef Tcl_GetDouble_TCL_DECLARED
 #define Tcl_GetDouble_TCL_DECLARED
 /* 34 */
-EXTERN int		Tcl_GetDouble (Tcl_Interp * interp, CONST char * src, 
+EXTERN int		Tcl_GetDouble (Tcl_Interp * interp, const char * src,
 				double * doublePtr);
 #endif
 #ifndef Tcl_GetDoubleFromObj_TCL_DECLARED
 #define Tcl_GetDoubleFromObj_TCL_DECLARED
 /* 35 */
-EXTERN int		Tcl_GetDoubleFromObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetDoubleFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, double * doublePtr);
 #endif
 #ifndef Tcl_GetIndexFromObj_TCL_DECLARED
 #define Tcl_GetIndexFromObj_TCL_DECLARED
 /* 36 */
-EXTERN int		Tcl_GetIndexFromObj (Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, 
-				CONST84 char *CONST * tablePtr, 
-				CONST char * msg, int flags, int * indexPtr);
+EXTERN int		Tcl_GetIndexFromObj (Tcl_Interp * interp,
+				Tcl_Obj * objPtr,
+				CONST84 char *const * tablePtr,
+				const char * msg, int flags, int * indexPtr);
 #endif
 #ifndef Tcl_GetInt_TCL_DECLARED
 #define Tcl_GetInt_TCL_DECLARED
 /* 37 */
-EXTERN int		Tcl_GetInt (Tcl_Interp * interp, CONST char * src, 
+EXTERN int		Tcl_GetInt (Tcl_Interp * interp, const char * src,
 				int * intPtr);
 #endif
 #ifndef Tcl_GetIntFromObj_TCL_DECLARED
 #define Tcl_GetIntFromObj_TCL_DECLARED
 /* 38 */
-EXTERN int		Tcl_GetIntFromObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetIntFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, int * intPtr);
 #endif
 #ifndef Tcl_GetLongFromObj_TCL_DECLARED
 #define Tcl_GetLongFromObj_TCL_DECLARED
 /* 39 */
-EXTERN int		Tcl_GetLongFromObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetLongFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, long * longPtr);
 #endif
 #ifndef Tcl_GetObjType_TCL_DECLARED
 #define Tcl_GetObjType_TCL_DECLARED
 /* 40 */
-EXTERN CONST86 Tcl_ObjType * Tcl_GetObjType (CONST char * typeName);
+EXTERN CONST86 Tcl_ObjType * Tcl_GetObjType (const char * typeName);
 #endif
 #ifndef Tcl_GetStringFromObj_TCL_DECLARED
 #define Tcl_GetStringFromObj_TCL_DECLARED
 /* 41 */
-EXTERN char *		Tcl_GetStringFromObj (Tcl_Obj * objPtr, 
+EXTERN char *		Tcl_GetStringFromObj (Tcl_Obj * objPtr,
 				int * lengthPtr);
 #endif
 #ifndef Tcl_InvalidateStringRep_TCL_DECLARED
@@ -307,41 +307,41 @@ EXTERN void		Tcl_InvalidateStringRep (Tcl_Obj * objPtr);
 #ifndef Tcl_ListObjAppendList_TCL_DECLARED
 #define Tcl_ListObjAppendList_TCL_DECLARED
 /* 43 */
-EXTERN int		Tcl_ListObjAppendList (Tcl_Interp * interp, 
+EXTERN int		Tcl_ListObjAppendList (Tcl_Interp * interp,
 				Tcl_Obj * listPtr, Tcl_Obj * elemListPtr);
 #endif
 #ifndef Tcl_ListObjAppendElement_TCL_DECLARED
 #define Tcl_ListObjAppendElement_TCL_DECLARED
 /* 44 */
-EXTERN int		Tcl_ListObjAppendElement (Tcl_Interp * interp, 
+EXTERN int		Tcl_ListObjAppendElement (Tcl_Interp * interp,
 				Tcl_Obj * listPtr, Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_ListObjGetElements_TCL_DECLARED
 #define Tcl_ListObjGetElements_TCL_DECLARED
 /* 45 */
-EXTERN int		Tcl_ListObjGetElements (Tcl_Interp * interp, 
-				Tcl_Obj * listPtr, int * objcPtr, 
+EXTERN int		Tcl_ListObjGetElements (Tcl_Interp * interp,
+				Tcl_Obj * listPtr, int * objcPtr,
 				Tcl_Obj *** objvPtr);
 #endif
 #ifndef Tcl_ListObjIndex_TCL_DECLARED
 #define Tcl_ListObjIndex_TCL_DECLARED
 /* 46 */
-EXTERN int		Tcl_ListObjIndex (Tcl_Interp * interp, 
-				Tcl_Obj * listPtr, int index, 
+EXTERN int		Tcl_ListObjIndex (Tcl_Interp * interp,
+				Tcl_Obj * listPtr, int index,
 				Tcl_Obj ** objPtrPtr);
 #endif
 #ifndef Tcl_ListObjLength_TCL_DECLARED
 #define Tcl_ListObjLength_TCL_DECLARED
 /* 47 */
-EXTERN int		Tcl_ListObjLength (Tcl_Interp * interp, 
+EXTERN int		Tcl_ListObjLength (Tcl_Interp * interp,
 				Tcl_Obj * listPtr, int * lengthPtr);
 #endif
 #ifndef Tcl_ListObjReplace_TCL_DECLARED
 #define Tcl_ListObjReplace_TCL_DECLARED
 /* 48 */
-EXTERN int		Tcl_ListObjReplace (Tcl_Interp * interp, 
-				Tcl_Obj * listPtr, int first, int count, 
-				int objc, Tcl_Obj *CONST objv[]);
+EXTERN int		Tcl_ListObjReplace (Tcl_Interp * interp,
+				Tcl_Obj * listPtr, int first, int count,
+				int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_NewBooleanObj_TCL_DECLARED
 #define Tcl_NewBooleanObj_TCL_DECLARED
@@ -351,7 +351,7 @@ EXTERN Tcl_Obj *	Tcl_NewBooleanObj (int boolValue);
 #ifndef Tcl_NewByteArrayObj_TCL_DECLARED
 #define Tcl_NewByteArrayObj_TCL_DECLARED
 /* 50 */
-EXTERN Tcl_Obj *	Tcl_NewByteArrayObj (CONST unsigned char* bytes, 
+EXTERN Tcl_Obj *	Tcl_NewByteArrayObj (const unsigned char* bytes,
 				int length);
 #endif
 #ifndef Tcl_NewDoubleObj_TCL_DECLARED
@@ -367,7 +367,7 @@ EXTERN Tcl_Obj *	Tcl_NewIntObj (int intValue);
 #ifndef Tcl_NewListObj_TCL_DECLARED
 #define Tcl_NewListObj_TCL_DECLARED
 /* 53 */
-EXTERN Tcl_Obj *	Tcl_NewListObj (int objc, Tcl_Obj *CONST objv[]);
+EXTERN Tcl_Obj *	Tcl_NewListObj (int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_NewLongObj_TCL_DECLARED
 #define Tcl_NewLongObj_TCL_DECLARED
@@ -382,7 +382,7 @@ EXTERN Tcl_Obj *	Tcl_NewObj (void);
 #ifndef Tcl_NewStringObj_TCL_DECLARED
 #define Tcl_NewStringObj_TCL_DECLARED
 /* 56 */
-EXTERN Tcl_Obj *	Tcl_NewStringObj (CONST char * bytes, int length);
+EXTERN Tcl_Obj *	Tcl_NewStringObj (const char * bytes, int length);
 #endif
 #ifndef Tcl_SetBooleanObj_TCL_DECLARED
 #define Tcl_SetBooleanObj_TCL_DECLARED
@@ -397,13 +397,13 @@ EXTERN unsigned char *	Tcl_SetByteArrayLength (Tcl_Obj * objPtr, int length);
 #ifndef Tcl_SetByteArrayObj_TCL_DECLARED
 #define Tcl_SetByteArrayObj_TCL_DECLARED
 /* 59 */
-EXTERN void		Tcl_SetByteArrayObj (Tcl_Obj * objPtr, 
-				CONST unsigned char * bytes, int length);
+EXTERN void		Tcl_SetByteArrayObj (Tcl_Obj * objPtr,
+				const unsigned char * bytes, int length);
 #endif
 #ifndef Tcl_SetDoubleObj_TCL_DECLARED
 #define Tcl_SetDoubleObj_TCL_DECLARED
 /* 60 */
-EXTERN void		Tcl_SetDoubleObj (Tcl_Obj * objPtr, 
+EXTERN void		Tcl_SetDoubleObj (Tcl_Obj * objPtr,
 				double doubleValue);
 #endif
 #ifndef Tcl_SetIntObj_TCL_DECLARED
@@ -414,8 +414,8 @@ EXTERN void		Tcl_SetIntObj (Tcl_Obj * objPtr, int intValue);
 #ifndef Tcl_SetListObj_TCL_DECLARED
 #define Tcl_SetListObj_TCL_DECLARED
 /* 62 */
-EXTERN void		Tcl_SetListObj (Tcl_Obj * objPtr, int objc, 
-				Tcl_Obj *CONST objv[]);
+EXTERN void		Tcl_SetListObj (Tcl_Obj * objPtr, int objc,
+				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_SetLongObj_TCL_DECLARED
 #define Tcl_SetLongObj_TCL_DECLARED
@@ -430,20 +430,20 @@ EXTERN void		Tcl_SetObjLength (Tcl_Obj * objPtr, int length);
 #ifndef Tcl_SetStringObj_TCL_DECLARED
 #define Tcl_SetStringObj_TCL_DECLARED
 /* 65 */
-EXTERN void		Tcl_SetStringObj (Tcl_Obj* objPtr, CONST char* bytes, 
+EXTERN void		Tcl_SetStringObj (Tcl_Obj* objPtr, const char* bytes,
 				int length);
 #endif
 #ifndef Tcl_AddErrorInfo_TCL_DECLARED
 #define Tcl_AddErrorInfo_TCL_DECLARED
 /* 66 */
-EXTERN void		Tcl_AddErrorInfo (Tcl_Interp * interp, 
-				CONST char * message);
+EXTERN void		Tcl_AddErrorInfo (Tcl_Interp * interp,
+				const char * message);
 #endif
 #ifndef Tcl_AddObjErrorInfo_TCL_DECLARED
 #define Tcl_AddObjErrorInfo_TCL_DECLARED
 /* 67 */
-EXTERN void		Tcl_AddObjErrorInfo (Tcl_Interp * interp, 
-				CONST char * message, int length);
+EXTERN void		Tcl_AddObjErrorInfo (Tcl_Interp * interp,
+				const char * message, int length);
 #endif
 #ifndef Tcl_AllowExceptions_TCL_DECLARED
 #define Tcl_AllowExceptions_TCL_DECLARED
@@ -453,8 +453,8 @@ EXTERN void		Tcl_AllowExceptions (Tcl_Interp * interp);
 #ifndef Tcl_AppendElement_TCL_DECLARED
 #define Tcl_AppendElement_TCL_DECLARED
 /* 69 */
-EXTERN void		Tcl_AppendElement (Tcl_Interp * interp, 
-				CONST char * element);
+EXTERN void		Tcl_AppendElement (Tcl_Interp * interp,
+				const char * element);
 #endif
 #ifndef Tcl_AppendResult_TCL_DECLARED
 #define Tcl_AppendResult_TCL_DECLARED
@@ -464,7 +464,7 @@ EXTERN void		Tcl_AppendResult (Tcl_Interp * interp, ...);
 #ifndef Tcl_AsyncCreate_TCL_DECLARED
 #define Tcl_AsyncCreate_TCL_DECLARED
 /* 71 */
-EXTERN Tcl_AsyncHandler	 Tcl_AsyncCreate (Tcl_AsyncProc * proc, 
+EXTERN Tcl_AsyncHandler	 Tcl_AsyncCreate (Tcl_AsyncProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_AsyncDelete_TCL_DECLARED
@@ -495,26 +495,26 @@ EXTERN void		Tcl_BackgroundError (Tcl_Interp * interp);
 #ifndef Tcl_Backslash_TCL_DECLARED
 #define Tcl_Backslash_TCL_DECLARED
 /* 77 */
-EXTERN char		Tcl_Backslash (CONST char * src, int * readPtr);
+EXTERN char		Tcl_Backslash (const char * src, int * readPtr);
 #endif
 #ifndef Tcl_BadChannelOption_TCL_DECLARED
 #define Tcl_BadChannelOption_TCL_DECLARED
 /* 78 */
-EXTERN int		Tcl_BadChannelOption (Tcl_Interp * interp, 
-				CONST char * optionName, 
-				CONST char * optionList);
+EXTERN int		Tcl_BadChannelOption (Tcl_Interp * interp,
+				const char * optionName,
+				const char * optionList);
 #endif
 #ifndef Tcl_CallWhenDeleted_TCL_DECLARED
 #define Tcl_CallWhenDeleted_TCL_DECLARED
 /* 79 */
-EXTERN void		Tcl_CallWhenDeleted (Tcl_Interp * interp, 
-				Tcl_InterpDeleteProc * proc, 
+EXTERN void		Tcl_CallWhenDeleted (Tcl_Interp * interp,
+				Tcl_InterpDeleteProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_CancelIdleCall_TCL_DECLARED
 #define Tcl_CancelIdleCall_TCL_DECLARED
 /* 80 */
-EXTERN void		Tcl_CancelIdleCall (Tcl_IdleProc * idleProc, 
+EXTERN void		Tcl_CancelIdleCall (Tcl_IdleProc * idleProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_Close_TCL_DECLARED
@@ -525,81 +525,81 @@ EXTERN int		Tcl_Close (Tcl_Interp * interp, Tcl_Channel chan);
 #ifndef Tcl_CommandComplete_TCL_DECLARED
 #define Tcl_CommandComplete_TCL_DECLARED
 /* 82 */
-EXTERN int		Tcl_CommandComplete (CONST char * cmd);
+EXTERN int		Tcl_CommandComplete (const char * cmd);
 #endif
 #ifndef Tcl_Concat_TCL_DECLARED
 #define Tcl_Concat_TCL_DECLARED
 /* 83 */
-EXTERN char *		Tcl_Concat (int argc, CONST84 char * CONST * argv);
+EXTERN char *		Tcl_Concat (int argc, CONST84 char * const * argv);
 #endif
 #ifndef Tcl_ConvertElement_TCL_DECLARED
 #define Tcl_ConvertElement_TCL_DECLARED
 /* 84 */
-EXTERN int		Tcl_ConvertElement (CONST char * src, char * dst, 
+EXTERN int		Tcl_ConvertElement (const char * src, char * dst,
 				int flags);
 #endif
 #ifndef Tcl_ConvertCountedElement_TCL_DECLARED
 #define Tcl_ConvertCountedElement_TCL_DECLARED
 /* 85 */
-EXTERN int		Tcl_ConvertCountedElement (CONST char * src, 
+EXTERN int		Tcl_ConvertCountedElement (const char * src,
 				int length, char * dst, int flags);
 #endif
 #ifndef Tcl_CreateAlias_TCL_DECLARED
 #define Tcl_CreateAlias_TCL_DECLARED
 /* 86 */
-EXTERN int		Tcl_CreateAlias (Tcl_Interp * slave, 
-				CONST char * slaveCmd, Tcl_Interp * target, 
-				CONST char * targetCmd, int argc, 
-				CONST84 char * CONST * argv);
+EXTERN int		Tcl_CreateAlias (Tcl_Interp * slave,
+				const char * slaveCmd, Tcl_Interp * target,
+				const char * targetCmd, int argc,
+				CONST84 char * const * argv);
 #endif
 #ifndef Tcl_CreateAliasObj_TCL_DECLARED
 #define Tcl_CreateAliasObj_TCL_DECLARED
 /* 87 */
-EXTERN int		Tcl_CreateAliasObj (Tcl_Interp * slave, 
-				CONST char * slaveCmd, Tcl_Interp * target, 
-				CONST char * targetCmd, int objc, 
-				Tcl_Obj *CONST objv[]);
+EXTERN int		Tcl_CreateAliasObj (Tcl_Interp * slave,
+				const char * slaveCmd, Tcl_Interp * target,
+				const char * targetCmd, int objc,
+				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_CreateChannel_TCL_DECLARED
 #define Tcl_CreateChannel_TCL_DECLARED
 /* 88 */
-EXTERN Tcl_Channel	Tcl_CreateChannel (CONST Tcl_ChannelType * typePtr, 
-				CONST char * chanName, 
+EXTERN Tcl_Channel	Tcl_CreateChannel (const Tcl_ChannelType * typePtr,
+				const char * chanName,
 				ClientData instanceData, int mask);
 #endif
 #ifndef Tcl_CreateChannelHandler_TCL_DECLARED
 #define Tcl_CreateChannelHandler_TCL_DECLARED
 /* 89 */
-EXTERN void		Tcl_CreateChannelHandler (Tcl_Channel chan, int mask, 
-				Tcl_ChannelProc * proc, 
+EXTERN void		Tcl_CreateChannelHandler (Tcl_Channel chan, int mask,
+				Tcl_ChannelProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_CreateCloseHandler_TCL_DECLARED
 #define Tcl_CreateCloseHandler_TCL_DECLARED
 /* 90 */
-EXTERN void		Tcl_CreateCloseHandler (Tcl_Channel chan, 
+EXTERN void		Tcl_CreateCloseHandler (Tcl_Channel chan,
 				Tcl_CloseProc * proc, ClientData clientData);
 #endif
 #ifndef Tcl_CreateCommand_TCL_DECLARED
 #define Tcl_CreateCommand_TCL_DECLARED
 /* 91 */
-EXTERN Tcl_Command	Tcl_CreateCommand (Tcl_Interp * interp, 
-				CONST char * cmdName, Tcl_CmdProc * proc, 
-				ClientData clientData, 
+EXTERN Tcl_Command	Tcl_CreateCommand (Tcl_Interp * interp,
+				const char * cmdName, Tcl_CmdProc * proc,
+				ClientData clientData,
 				Tcl_CmdDeleteProc * deleteProc);
 #endif
 #ifndef Tcl_CreateEventSource_TCL_DECLARED
 #define Tcl_CreateEventSource_TCL_DECLARED
 /* 92 */
 EXTERN void		Tcl_CreateEventSource (
-				Tcl_EventSetupProc * setupProc, 
-				Tcl_EventCheckProc * checkProc, 
+				Tcl_EventSetupProc * setupProc,
+				Tcl_EventCheckProc * checkProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_CreateExitHandler_TCL_DECLARED
 #define Tcl_CreateExitHandler_TCL_DECLARED
 /* 93 */
-EXTERN void		Tcl_CreateExitHandler (Tcl_ExitProc * proc, 
+EXTERN void		Tcl_CreateExitHandler (Tcl_ExitProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_CreateInterp_TCL_DECLARED
@@ -610,87 +610,87 @@ EXTERN Tcl_Interp *	Tcl_CreateInterp (void);
 #ifndef Tcl_CreateMathFunc_TCL_DECLARED
 #define Tcl_CreateMathFunc_TCL_DECLARED
 /* 95 */
-EXTERN void		Tcl_CreateMathFunc (Tcl_Interp * interp, 
-				CONST char * name, int numArgs, 
-				Tcl_ValueType * argTypes, 
+EXTERN void		Tcl_CreateMathFunc (Tcl_Interp * interp,
+				const char * name, int numArgs,
+				Tcl_ValueType * argTypes,
 				Tcl_MathProc * proc, ClientData clientData);
 #endif
 #ifndef Tcl_CreateObjCommand_TCL_DECLARED
 #define Tcl_CreateObjCommand_TCL_DECLARED
 /* 96 */
-EXTERN Tcl_Command	Tcl_CreateObjCommand (Tcl_Interp * interp, 
-				CONST char * cmdName, Tcl_ObjCmdProc * proc, 
-				ClientData clientData, 
+EXTERN Tcl_Command	Tcl_CreateObjCommand (Tcl_Interp * interp,
+				const char * cmdName, Tcl_ObjCmdProc * proc,
+				ClientData clientData,
 				Tcl_CmdDeleteProc * deleteProc);
 #endif
 #ifndef Tcl_CreateSlave_TCL_DECLARED
 #define Tcl_CreateSlave_TCL_DECLARED
 /* 97 */
-EXTERN Tcl_Interp *	Tcl_CreateSlave (Tcl_Interp * interp, 
-				CONST char * slaveName, int isSafe);
+EXTERN Tcl_Interp *	Tcl_CreateSlave (Tcl_Interp * interp,
+				const char * slaveName, int isSafe);
 #endif
 #ifndef Tcl_CreateTimerHandler_TCL_DECLARED
 #define Tcl_CreateTimerHandler_TCL_DECLARED
 /* 98 */
-EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler (int milliseconds, 
+EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler (int milliseconds,
 				Tcl_TimerProc * proc, ClientData clientData);
 #endif
 #ifndef Tcl_CreateTrace_TCL_DECLARED
 #define Tcl_CreateTrace_TCL_DECLARED
 /* 99 */
-EXTERN Tcl_Trace	Tcl_CreateTrace (Tcl_Interp * interp, int level, 
-				Tcl_CmdTraceProc * proc, 
+EXTERN Tcl_Trace	Tcl_CreateTrace (Tcl_Interp * interp, int level,
+				Tcl_CmdTraceProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteAssocData_TCL_DECLARED
 #define Tcl_DeleteAssocData_TCL_DECLARED
 /* 100 */
-EXTERN void		Tcl_DeleteAssocData (Tcl_Interp * interp, 
-				CONST char * name);
+EXTERN void		Tcl_DeleteAssocData (Tcl_Interp * interp,
+				const char * name);
 #endif
 #ifndef Tcl_DeleteChannelHandler_TCL_DECLARED
 #define Tcl_DeleteChannelHandler_TCL_DECLARED
 /* 101 */
-EXTERN void		Tcl_DeleteChannelHandler (Tcl_Channel chan, 
-				Tcl_ChannelProc * proc, 
+EXTERN void		Tcl_DeleteChannelHandler (Tcl_Channel chan,
+				Tcl_ChannelProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteCloseHandler_TCL_DECLARED
 #define Tcl_DeleteCloseHandler_TCL_DECLARED
 /* 102 */
-EXTERN void		Tcl_DeleteCloseHandler (Tcl_Channel chan, 
+EXTERN void		Tcl_DeleteCloseHandler (Tcl_Channel chan,
 				Tcl_CloseProc * proc, ClientData clientData);
 #endif
 #ifndef Tcl_DeleteCommand_TCL_DECLARED
 #define Tcl_DeleteCommand_TCL_DECLARED
 /* 103 */
-EXTERN int		Tcl_DeleteCommand (Tcl_Interp * interp, 
-				CONST char * cmdName);
+EXTERN int		Tcl_DeleteCommand (Tcl_Interp * interp,
+				const char * cmdName);
 #endif
 #ifndef Tcl_DeleteCommandFromToken_TCL_DECLARED
 #define Tcl_DeleteCommandFromToken_TCL_DECLARED
 /* 104 */
-EXTERN int		Tcl_DeleteCommandFromToken (Tcl_Interp * interp, 
+EXTERN int		Tcl_DeleteCommandFromToken (Tcl_Interp * interp,
 				Tcl_Command command);
 #endif
 #ifndef Tcl_DeleteEvents_TCL_DECLARED
 #define Tcl_DeleteEvents_TCL_DECLARED
 /* 105 */
-EXTERN void		Tcl_DeleteEvents (Tcl_EventDeleteProc * proc, 
+EXTERN void		Tcl_DeleteEvents (Tcl_EventDeleteProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteEventSource_TCL_DECLARED
 #define Tcl_DeleteEventSource_TCL_DECLARED
 /* 106 */
 EXTERN void		Tcl_DeleteEventSource (
-				Tcl_EventSetupProc * setupProc, 
-				Tcl_EventCheckProc * checkProc, 
+				Tcl_EventSetupProc * setupProc,
+				Tcl_EventCheckProc * checkProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteExitHandler_TCL_DECLARED
 #define Tcl_DeleteExitHandler_TCL_DECLARED
 /* 107 */
-EXTERN void		Tcl_DeleteExitHandler (Tcl_ExitProc * proc, 
+EXTERN void		Tcl_DeleteExitHandler (Tcl_ExitProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteHashEntry_TCL_DECLARED
@@ -737,14 +737,14 @@ EXTERN void		Tcl_DeleteTimerHandler (Tcl_TimerToken token);
 #ifndef Tcl_DeleteTrace_TCL_DECLARED
 #define Tcl_DeleteTrace_TCL_DECLARED
 /* 113 */
-EXTERN void		Tcl_DeleteTrace (Tcl_Interp * interp, 
+EXTERN void		Tcl_DeleteTrace (Tcl_Interp * interp,
 				Tcl_Trace trace);
 #endif
 #ifndef Tcl_DontCallWhenDeleted_TCL_DECLARED
 #define Tcl_DontCallWhenDeleted_TCL_DECLARED
 /* 114 */
-EXTERN void		Tcl_DontCallWhenDeleted (Tcl_Interp * interp, 
-				Tcl_InterpDeleteProc * proc, 
+EXTERN void		Tcl_DontCallWhenDeleted (Tcl_Interp * interp,
+				Tcl_InterpDeleteProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DoOneEvent_TCL_DECLARED
@@ -755,20 +755,20 @@ EXTERN int		Tcl_DoOneEvent (int flags);
 #ifndef Tcl_DoWhenIdle_TCL_DECLARED
 #define Tcl_DoWhenIdle_TCL_DECLARED
 /* 116 */
-EXTERN void		Tcl_DoWhenIdle (Tcl_IdleProc * proc, 
+EXTERN void		Tcl_DoWhenIdle (Tcl_IdleProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DStringAppend_TCL_DECLARED
 #define Tcl_DStringAppend_TCL_DECLARED
 /* 117 */
-EXTERN char *		Tcl_DStringAppend (Tcl_DString * dsPtr, 
-				CONST char * bytes, int length);
+EXTERN char *		Tcl_DStringAppend (Tcl_DString * dsPtr,
+				const char * bytes, int length);
 #endif
 #ifndef Tcl_DStringAppendElement_TCL_DECLARED
 #define Tcl_DStringAppendElement_TCL_DECLARED
 /* 118 */
-EXTERN char *		Tcl_DStringAppendElement (Tcl_DString * dsPtr, 
-				CONST char * element);
+EXTERN char *		Tcl_DStringAppendElement (Tcl_DString * dsPtr,
+				const char * element);
 #endif
 #ifndef Tcl_DStringEndSublist_TCL_DECLARED
 #define Tcl_DStringEndSublist_TCL_DECLARED
@@ -783,7 +783,7 @@ EXTERN void		Tcl_DStringFree (Tcl_DString * dsPtr);
 #ifndef Tcl_DStringGetResult_TCL_DECLARED
 #define Tcl_DStringGetResult_TCL_DECLARED
 /* 121 */
-EXTERN void		Tcl_DStringGetResult (Tcl_Interp * interp, 
+EXTERN void		Tcl_DStringGetResult (Tcl_Interp * interp,
 				Tcl_DString * dsPtr);
 #endif
 #ifndef Tcl_DStringInit_TCL_DECLARED
@@ -794,13 +794,13 @@ EXTERN void		Tcl_DStringInit (Tcl_DString * dsPtr);
 #ifndef Tcl_DStringResult_TCL_DECLARED
 #define Tcl_DStringResult_TCL_DECLARED
 /* 123 */
-EXTERN void		Tcl_DStringResult (Tcl_Interp * interp, 
+EXTERN void		Tcl_DStringResult (Tcl_Interp * interp,
 				Tcl_DString * dsPtr);
 #endif
 #ifndef Tcl_DStringSetLength_TCL_DECLARED
 #define Tcl_DStringSetLength_TCL_DECLARED
 /* 124 */
-EXTERN void		Tcl_DStringSetLength (Tcl_DString * dsPtr, 
+EXTERN void		Tcl_DStringSetLength (Tcl_DString * dsPtr,
 				int length);
 #endif
 #ifndef Tcl_DStringStartSublist_TCL_DECLARED
@@ -826,13 +826,13 @@ EXTERN CONST84_RETURN char * Tcl_ErrnoMsg (int err);
 #ifndef Tcl_Eval_TCL_DECLARED
 #define Tcl_Eval_TCL_DECLARED
 /* 129 */
-EXTERN int		Tcl_Eval (Tcl_Interp * interp, CONST char * script);
+EXTERN int		Tcl_Eval (Tcl_Interp * interp, const char * script);
 #endif
 #ifndef Tcl_EvalFile_TCL_DECLARED
 #define Tcl_EvalFile_TCL_DECLARED
 /* 130 */
-EXTERN int		Tcl_EvalFile (Tcl_Interp * interp, 
-				CONST char * fileName);
+EXTERN int		Tcl_EvalFile (Tcl_Interp * interp,
+				const char * fileName);
 #endif
 #ifndef Tcl_EvalObj_TCL_DECLARED
 #define Tcl_EvalObj_TCL_DECLARED
@@ -842,7 +842,7 @@ EXTERN int		Tcl_EvalObj (Tcl_Interp * interp, Tcl_Obj * objPtr);
 #ifndef Tcl_EventuallyFree_TCL_DECLARED
 #define Tcl_EventuallyFree_TCL_DECLARED
 /* 132 */
-EXTERN void		Tcl_EventuallyFree (ClientData clientData, 
+EXTERN void		Tcl_EventuallyFree (ClientData clientData,
 				Tcl_FreeProc * freeProc);
 #endif
 #ifndef Tcl_Exit_TCL_DECLARED
@@ -853,57 +853,57 @@ EXTERN void		Tcl_Exit (int status);
 #ifndef Tcl_ExposeCommand_TCL_DECLARED
 #define Tcl_ExposeCommand_TCL_DECLARED
 /* 134 */
-EXTERN int		Tcl_ExposeCommand (Tcl_Interp * interp, 
-				CONST char * hiddenCmdToken, 
-				CONST char * cmdName);
+EXTERN int		Tcl_ExposeCommand (Tcl_Interp * interp,
+				const char * hiddenCmdToken,
+				const char * cmdName);
 #endif
 #ifndef Tcl_ExprBoolean_TCL_DECLARED
 #define Tcl_ExprBoolean_TCL_DECLARED
 /* 135 */
-EXTERN int		Tcl_ExprBoolean (Tcl_Interp * interp, 
-				CONST char * expr, int * ptr);
+EXTERN int		Tcl_ExprBoolean (Tcl_Interp * interp,
+				const char * expr, int * ptr);
 #endif
 #ifndef Tcl_ExprBooleanObj_TCL_DECLARED
 #define Tcl_ExprBooleanObj_TCL_DECLARED
 /* 136 */
-EXTERN int		Tcl_ExprBooleanObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_ExprBooleanObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, int * ptr);
 #endif
 #ifndef Tcl_ExprDouble_TCL_DECLARED
 #define Tcl_ExprDouble_TCL_DECLARED
 /* 137 */
-EXTERN int		Tcl_ExprDouble (Tcl_Interp * interp, 
-				CONST char * expr, double * ptr);
+EXTERN int		Tcl_ExprDouble (Tcl_Interp * interp,
+				const char * expr, double * ptr);
 #endif
 #ifndef Tcl_ExprDoubleObj_TCL_DECLARED
 #define Tcl_ExprDoubleObj_TCL_DECLARED
 /* 138 */
-EXTERN int		Tcl_ExprDoubleObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_ExprDoubleObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, double * ptr);
 #endif
 #ifndef Tcl_ExprLong_TCL_DECLARED
 #define Tcl_ExprLong_TCL_DECLARED
 /* 139 */
-EXTERN int		Tcl_ExprLong (Tcl_Interp * interp, CONST char * expr, 
+EXTERN int		Tcl_ExprLong (Tcl_Interp * interp, const char * expr,
 				long * ptr);
 #endif
 #ifndef Tcl_ExprLongObj_TCL_DECLARED
 #define Tcl_ExprLongObj_TCL_DECLARED
 /* 140 */
-EXTERN int		Tcl_ExprLongObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_ExprLongObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, long * ptr);
 #endif
 #ifndef Tcl_ExprObj_TCL_DECLARED
 #define Tcl_ExprObj_TCL_DECLARED
 /* 141 */
-EXTERN int		Tcl_ExprObj (Tcl_Interp * interp, Tcl_Obj * objPtr, 
+EXTERN int		Tcl_ExprObj (Tcl_Interp * interp, Tcl_Obj * objPtr,
 				Tcl_Obj ** resultPtrPtr);
 #endif
 #ifndef Tcl_ExprString_TCL_DECLARED
 #define Tcl_ExprString_TCL_DECLARED
 /* 142 */
-EXTERN int		Tcl_ExprString (Tcl_Interp * interp, 
-				CONST char * expr);
+EXTERN int		Tcl_ExprString (Tcl_Interp * interp,
+				const char * expr);
 #endif
 #ifndef Tcl_Finalize_TCL_DECLARED
 #define Tcl_Finalize_TCL_DECLARED
@@ -913,12 +913,12 @@ EXTERN void		Tcl_Finalize (void);
 #ifndef Tcl_FindExecutable_TCL_DECLARED
 #define Tcl_FindExecutable_TCL_DECLARED
 /* 144 */
-EXTERN void		Tcl_FindExecutable (CONST char * argv0);
+EXTERN void		Tcl_FindExecutable (const char * argv0);
 #endif
 #ifndef Tcl_FirstHashEntry_TCL_DECLARED
 #define Tcl_FirstHashEntry_TCL_DECLARED
 /* 145 */
-EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry (Tcl_HashTable * tablePtr, 
+EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry (Tcl_HashTable * tablePtr,
 				Tcl_HashSearch * searchPtr);
 #endif
 #ifndef Tcl_Flush_TCL_DECLARED
@@ -934,33 +934,33 @@ EXTERN void		Tcl_FreeResult (Tcl_Interp * interp);
 #ifndef Tcl_GetAlias_TCL_DECLARED
 #define Tcl_GetAlias_TCL_DECLARED
 /* 148 */
-EXTERN int		Tcl_GetAlias (Tcl_Interp * interp, 
-				CONST char * slaveCmd, 
-				Tcl_Interp ** targetInterpPtr, 
-				CONST84 char ** targetCmdPtr, int * argcPtr, 
+EXTERN int		Tcl_GetAlias (Tcl_Interp * interp,
+				const char * slaveCmd,
+				Tcl_Interp ** targetInterpPtr,
+				CONST84 char ** targetCmdPtr, int * argcPtr,
 				CONST84 char *** argvPtr);
 #endif
 #ifndef Tcl_GetAliasObj_TCL_DECLARED
 #define Tcl_GetAliasObj_TCL_DECLARED
 /* 149 */
-EXTERN int		Tcl_GetAliasObj (Tcl_Interp * interp, 
-				CONST char * slaveCmd, 
-				Tcl_Interp ** targetInterpPtr, 
-				CONST84 char ** targetCmdPtr, int * objcPtr, 
+EXTERN int		Tcl_GetAliasObj (Tcl_Interp * interp,
+				const char * slaveCmd,
+				Tcl_Interp ** targetInterpPtr,
+				CONST84 char ** targetCmdPtr, int * objcPtr,
 				Tcl_Obj *** objv);
 #endif
 #ifndef Tcl_GetAssocData_TCL_DECLARED
 #define Tcl_GetAssocData_TCL_DECLARED
 /* 150 */
-EXTERN ClientData	Tcl_GetAssocData (Tcl_Interp * interp, 
-				CONST char * name, 
+EXTERN ClientData	Tcl_GetAssocData (Tcl_Interp * interp,
+				const char * name,
 				Tcl_InterpDeleteProc ** procPtr);
 #endif
 #ifndef Tcl_GetChannel_TCL_DECLARED
 #define Tcl_GetChannel_TCL_DECLARED
 /* 151 */
-EXTERN Tcl_Channel	Tcl_GetChannel (Tcl_Interp * interp, 
-				CONST char * chanName, int * modePtr);
+EXTERN Tcl_Channel	Tcl_GetChannel (Tcl_Interp * interp,
+				const char * chanName, int * modePtr);
 #endif
 #ifndef Tcl_GetChannelBufferSize_TCL_DECLARED
 #define Tcl_GetChannelBufferSize_TCL_DECLARED
@@ -970,7 +970,7 @@ EXTERN int		Tcl_GetChannelBufferSize (Tcl_Channel chan);
 #ifndef Tcl_GetChannelHandle_TCL_DECLARED
 #define Tcl_GetChannelHandle_TCL_DECLARED
 /* 153 */
-EXTERN int		Tcl_GetChannelHandle (Tcl_Channel chan, 
+EXTERN int		Tcl_GetChannelHandle (Tcl_Channel chan,
 				int direction, ClientData * handlePtr);
 #endif
 #ifndef Tcl_GetChannelInstanceData_TCL_DECLARED
@@ -991,8 +991,8 @@ EXTERN CONST84_RETURN char * Tcl_GetChannelName (Tcl_Channel chan);
 #ifndef Tcl_GetChannelOption_TCL_DECLARED
 #define Tcl_GetChannelOption_TCL_DECLARED
 /* 157 */
-EXTERN int		Tcl_GetChannelOption (Tcl_Interp * interp, 
-				Tcl_Channel chan, CONST char * optionName, 
+EXTERN int		Tcl_GetChannelOption (Tcl_Interp * interp,
+				Tcl_Channel chan, const char * optionName,
 				Tcl_DString * dsPtr);
 #endif
 #ifndef Tcl_GetChannelType_TCL_DECLARED
@@ -1003,13 +1003,13 @@ EXTERN CONST86 Tcl_ChannelType * Tcl_GetChannelType (Tcl_Channel chan);
 #ifndef Tcl_GetCommandInfo_TCL_DECLARED
 #define Tcl_GetCommandInfo_TCL_DECLARED
 /* 159 */
-EXTERN int		Tcl_GetCommandInfo (Tcl_Interp * interp, 
-				CONST char * cmdName, Tcl_CmdInfo * infoPtr);
+EXTERN int		Tcl_GetCommandInfo (Tcl_Interp * interp,
+				const char * cmdName, Tcl_CmdInfo * infoPtr);
 #endif
 #ifndef Tcl_GetCommandName_TCL_DECLARED
 #define Tcl_GetCommandName_TCL_DECLARED
 /* 160 */
-EXTERN CONST84_RETURN char * Tcl_GetCommandName (Tcl_Interp * interp, 
+EXTERN CONST84_RETURN char * Tcl_GetCommandName (Tcl_Interp * interp,
 				Tcl_Command command);
 #endif
 #ifndef Tcl_GetErrno_TCL_DECLARED
@@ -1025,7 +1025,7 @@ EXTERN CONST84_RETURN char * Tcl_GetHostName (void);
 #ifndef Tcl_GetInterpPath_TCL_DECLARED
 #define Tcl_GetInterpPath_TCL_DECLARED
 /* 163 */
-EXTERN int		Tcl_GetInterpPath (Tcl_Interp * askInterp, 
+EXTERN int		Tcl_GetInterpPath (Tcl_Interp * askInterp,
 				Tcl_Interp * slaveInterp);
 #endif
 #ifndef Tcl_GetMaster_TCL_DECLARED
@@ -1036,7 +1036,7 @@ EXTERN Tcl_Interp *	Tcl_GetMaster (Tcl_Interp * interp);
 #ifndef Tcl_GetNameOfExecutable_TCL_DECLARED
 #define Tcl_GetNameOfExecutable_TCL_DECLARED
 /* 165 */
-EXTERN CONST char *	Tcl_GetNameOfExecutable (void);
+EXTERN const char *	Tcl_GetNameOfExecutable (void);
 #endif
 #ifndef Tcl_GetObjResult_TCL_DECLARED
 #define Tcl_GetObjResult_TCL_DECLARED
@@ -1047,8 +1047,8 @@ EXTERN Tcl_Obj *	Tcl_GetObjResult (Tcl_Interp * interp);
 #ifndef Tcl_GetOpenFile_TCL_DECLARED
 #define Tcl_GetOpenFile_TCL_DECLARED
 /* 167 */
-EXTERN int		Tcl_GetOpenFile (Tcl_Interp * interp, 
-				CONST char * chanID, int forWriting, 
+EXTERN int		Tcl_GetOpenFile (Tcl_Interp * interp,
+				const char * chanID, int forWriting,
 				int checkUsage, ClientData * filePtr);
 #endif
 #endif /* UNIX */
@@ -1056,15 +1056,15 @@ EXTERN int		Tcl_GetOpenFile (Tcl_Interp * interp,
 #ifndef Tcl_GetOpenFile_TCL_DECLARED
 #define Tcl_GetOpenFile_TCL_DECLARED
 /* 167 */
-EXTERN int		Tcl_GetOpenFile (Tcl_Interp * interp, 
-				CONST char * chanID, int forWriting, 
+EXTERN int		Tcl_GetOpenFile (Tcl_Interp * interp,
+				const char * chanID, int forWriting,
 				int checkUsage, ClientData * filePtr);
 #endif
 #endif /* MACOSX */
 #ifndef Tcl_GetPathType_TCL_DECLARED
 #define Tcl_GetPathType_TCL_DECLARED
 /* 168 */
-EXTERN Tcl_PathType	Tcl_GetPathType (CONST char * path);
+EXTERN Tcl_PathType	Tcl_GetPathType (const char * path);
 #endif
 #ifndef Tcl_Gets_TCL_DECLARED
 #define Tcl_Gets_TCL_DECLARED
@@ -1084,8 +1084,8 @@ EXTERN int		Tcl_GetServiceMode (void);
 #ifndef Tcl_GetSlave_TCL_DECLARED
 #define Tcl_GetSlave_TCL_DECLARED
 /* 172 */
-EXTERN Tcl_Interp *	Tcl_GetSlave (Tcl_Interp * interp, 
-				CONST char * slaveName);
+EXTERN Tcl_Interp *	Tcl_GetSlave (Tcl_Interp * interp,
+				const char * slaveName);
 #endif
 #ifndef Tcl_GetStdChannel_TCL_DECLARED
 #define Tcl_GetStdChannel_TCL_DECLARED
@@ -1100,34 +1100,34 @@ EXTERN CONST84_RETURN char * Tcl_GetStringResult (Tcl_Interp * interp);
 #ifndef Tcl_GetVar_TCL_DECLARED
 #define Tcl_GetVar_TCL_DECLARED
 /* 175 */
-EXTERN CONST84_RETURN char * Tcl_GetVar (Tcl_Interp * interp, 
-				CONST char * varName, int flags);
+EXTERN CONST84_RETURN char * Tcl_GetVar (Tcl_Interp * interp,
+				const char * varName, int flags);
 #endif
 #ifndef Tcl_GetVar2_TCL_DECLARED
 #define Tcl_GetVar2_TCL_DECLARED
 /* 176 */
-EXTERN CONST84_RETURN char * Tcl_GetVar2 (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
+EXTERN CONST84_RETURN char * Tcl_GetVar2 (Tcl_Interp * interp,
+				const char * part1, const char * part2,
 				int flags);
 #endif
 #ifndef Tcl_GlobalEval_TCL_DECLARED
 #define Tcl_GlobalEval_TCL_DECLARED
 /* 177 */
-EXTERN int		Tcl_GlobalEval (Tcl_Interp * interp, 
-				CONST char * command);
+EXTERN int		Tcl_GlobalEval (Tcl_Interp * interp,
+				const char * command);
 #endif
 #ifndef Tcl_GlobalEvalObj_TCL_DECLARED
 #define Tcl_GlobalEvalObj_TCL_DECLARED
 /* 178 */
-EXTERN int		Tcl_GlobalEvalObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_GlobalEvalObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_HideCommand_TCL_DECLARED
 #define Tcl_HideCommand_TCL_DECLARED
 /* 179 */
-EXTERN int		Tcl_HideCommand (Tcl_Interp * interp, 
-				CONST char * cmdName, 
-				CONST char * hiddenCmdToken);
+EXTERN int		Tcl_HideCommand (Tcl_Interp * interp,
+				const char * cmdName,
+				const char * hiddenCmdToken);
 #endif
 #ifndef Tcl_Init_TCL_DECLARED
 #define Tcl_Init_TCL_DECLARED
@@ -1137,7 +1137,7 @@ EXTERN int		Tcl_Init (Tcl_Interp * interp);
 #ifndef Tcl_InitHashTable_TCL_DECLARED
 #define Tcl_InitHashTable_TCL_DECLARED
 /* 181 */
-EXTERN void		Tcl_InitHashTable (Tcl_HashTable * tablePtr, 
+EXTERN void		Tcl_InitHashTable (Tcl_HashTable * tablePtr,
 				int keyType);
 #endif
 #ifndef Tcl_InputBlocked_TCL_DECLARED
@@ -1163,14 +1163,14 @@ EXTERN int		Tcl_IsSafe (Tcl_Interp * interp);
 #ifndef Tcl_JoinPath_TCL_DECLARED
 #define Tcl_JoinPath_TCL_DECLARED
 /* 186 */
-EXTERN char *		Tcl_JoinPath (int argc, CONST84 char * CONST * argv, 
+EXTERN char *		Tcl_JoinPath (int argc, CONST84 char * const * argv,
 				Tcl_DString * resultPtr);
 #endif
 #ifndef Tcl_LinkVar_TCL_DECLARED
 #define Tcl_LinkVar_TCL_DECLARED
 /* 187 */
-EXTERN int		Tcl_LinkVar (Tcl_Interp * interp, 
-				CONST char * varName, char * addr, int type);
+EXTERN int		Tcl_LinkVar (Tcl_Interp * interp,
+				const char * varName, char * addr, int type);
 #endif
 /* Slot 188 is reserved */
 #ifndef Tcl_MakeFileChannel_TCL_DECLARED
@@ -1191,7 +1191,7 @@ EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel (ClientData tcpSocket);
 #ifndef Tcl_Merge_TCL_DECLARED
 #define Tcl_Merge_TCL_DECLARED
 /* 192 */
-EXTERN char *		Tcl_Merge (int argc, CONST84 char * CONST * argv);
+EXTERN char *		Tcl_Merge (int argc, CONST84 char * const * argv);
 #endif
 #ifndef Tcl_NextHashEntry_TCL_DECLARED
 #define Tcl_NextHashEntry_TCL_DECLARED
@@ -1206,22 +1206,22 @@ EXTERN void		Tcl_NotifyChannel (Tcl_Channel channel, int mask);
 #ifndef Tcl_ObjGetVar2_TCL_DECLARED
 #define Tcl_ObjGetVar2_TCL_DECLARED
 /* 195 */
-EXTERN Tcl_Obj *	Tcl_ObjGetVar2 (Tcl_Interp * interp, 
-				Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, 
+EXTERN Tcl_Obj *	Tcl_ObjGetVar2 (Tcl_Interp * interp,
+				Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr,
 				int flags);
 #endif
 #ifndef Tcl_ObjSetVar2_TCL_DECLARED
 #define Tcl_ObjSetVar2_TCL_DECLARED
 /* 196 */
-EXTERN Tcl_Obj *	Tcl_ObjSetVar2 (Tcl_Interp * interp, 
-				Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, 
+EXTERN Tcl_Obj *	Tcl_ObjSetVar2 (Tcl_Interp * interp,
+				Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr,
 				Tcl_Obj * newValuePtr, int flags);
 #endif
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
 #ifndef Tcl_OpenCommandChannel_TCL_DECLARED
 #define Tcl_OpenCommandChannel_TCL_DECLARED
 /* 197 */
-EXTERN Tcl_Channel	Tcl_OpenCommandChannel (Tcl_Interp * interp, 
+EXTERN Tcl_Channel	Tcl_OpenCommandChannel (Tcl_Interp * interp,
 				int argc, CONST84 char ** argv, int flags);
 #endif
 #endif /* UNIX */
@@ -1229,7 +1229,7 @@ EXTERN Tcl_Channel	Tcl_OpenCommandChannel (Tcl_Interp * interp,
 #ifndef Tcl_OpenCommandChannel_TCL_DECLARED
 #define Tcl_OpenCommandChannel_TCL_DECLARED
 /* 197 */
-EXTERN Tcl_Channel	Tcl_OpenCommandChannel (Tcl_Interp * interp, 
+EXTERN Tcl_Channel	Tcl_OpenCommandChannel (Tcl_Interp * interp,
 				int argc, CONST84 char ** argv, int flags);
 #endif
 #endif /* WIN */
@@ -1237,30 +1237,30 @@ EXTERN Tcl_Channel	Tcl_OpenCommandChannel (Tcl_Interp * interp,
 #ifndef Tcl_OpenCommandChannel_TCL_DECLARED
 #define Tcl_OpenCommandChannel_TCL_DECLARED
 /* 197 */
-EXTERN Tcl_Channel	Tcl_OpenCommandChannel (Tcl_Interp * interp, 
+EXTERN Tcl_Channel	Tcl_OpenCommandChannel (Tcl_Interp * interp,
 				int argc, CONST84 char ** argv, int flags);
 #endif
 #endif /* MACOSX */
 #ifndef Tcl_OpenFileChannel_TCL_DECLARED
 #define Tcl_OpenFileChannel_TCL_DECLARED
 /* 198 */
-EXTERN Tcl_Channel	Tcl_OpenFileChannel (Tcl_Interp * interp, 
-				CONST char * fileName, 
-				CONST char * modeString, int permissions);
+EXTERN Tcl_Channel	Tcl_OpenFileChannel (Tcl_Interp * interp,
+				const char * fileName,
+				const char * modeString, int permissions);
 #endif
 #ifndef Tcl_OpenTcpClient_TCL_DECLARED
 #define Tcl_OpenTcpClient_TCL_DECLARED
 /* 199 */
-EXTERN Tcl_Channel	Tcl_OpenTcpClient (Tcl_Interp * interp, int port, 
-				CONST char * address, CONST char * myaddr, 
+EXTERN Tcl_Channel	Tcl_OpenTcpClient (Tcl_Interp * interp, int port,
+				const char * address, const char * myaddr,
 				int myport, int async);
 #endif
 #ifndef Tcl_OpenTcpServer_TCL_DECLARED
 #define Tcl_OpenTcpServer_TCL_DECLARED
 /* 200 */
-EXTERN Tcl_Channel	Tcl_OpenTcpServer (Tcl_Interp * interp, int port, 
-				CONST char * host, 
-				Tcl_TcpAcceptProc * acceptProc, 
+EXTERN Tcl_Channel	Tcl_OpenTcpServer (Tcl_Interp * interp, int port,
+				const char * host,
+				Tcl_TcpAcceptProc * acceptProc,
 				ClientData callbackData);
 #endif
 #ifndef Tcl_Preserve_TCL_DECLARED
@@ -1271,13 +1271,13 @@ EXTERN void		Tcl_Preserve (ClientData data);
 #ifndef Tcl_PrintDouble_TCL_DECLARED
 #define Tcl_PrintDouble_TCL_DECLARED
 /* 202 */
-EXTERN void		Tcl_PrintDouble (Tcl_Interp * interp, double value, 
+EXTERN void		Tcl_PrintDouble (Tcl_Interp * interp, double value,
 				char * dst);
 #endif
 #ifndef Tcl_PutEnv_TCL_DECLARED
 #define Tcl_PutEnv_TCL_DECLARED
 /* 203 */
-EXTERN int		Tcl_PutEnv (CONST char * assignment);
+EXTERN int		Tcl_PutEnv (const char * assignment);
 #endif
 #ifndef Tcl_PosixError_TCL_DECLARED
 #define Tcl_PosixError_TCL_DECLARED
@@ -1287,13 +1287,13 @@ EXTERN CONST84_RETURN char * Tcl_PosixError (Tcl_Interp * interp);
 #ifndef Tcl_QueueEvent_TCL_DECLARED
 #define Tcl_QueueEvent_TCL_DECLARED
 /* 205 */
-EXTERN void		Tcl_QueueEvent (Tcl_Event * evPtr, 
+EXTERN void		Tcl_QueueEvent (Tcl_Event * evPtr,
 				Tcl_QueuePosition position);
 #endif
 #ifndef Tcl_Read_TCL_DECLARED
 #define Tcl_Read_TCL_DECLARED
 /* 206 */
-EXTERN int		Tcl_Read (Tcl_Channel chan, char * bufPtr, 
+EXTERN int		Tcl_Read (Tcl_Channel chan, char * bufPtr,
 				int toRead);
 #endif
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
@@ -1320,50 +1320,50 @@ EXTERN void		Tcl_ReapDetachedProcs (void);
 #ifndef Tcl_RecordAndEval_TCL_DECLARED
 #define Tcl_RecordAndEval_TCL_DECLARED
 /* 208 */
-EXTERN int		Tcl_RecordAndEval (Tcl_Interp * interp, 
-				CONST char * cmd, int flags);
+EXTERN int		Tcl_RecordAndEval (Tcl_Interp * interp,
+				const char * cmd, int flags);
 #endif
 #ifndef Tcl_RecordAndEvalObj_TCL_DECLARED
 #define Tcl_RecordAndEvalObj_TCL_DECLARED
 /* 209 */
-EXTERN int		Tcl_RecordAndEvalObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_RecordAndEvalObj (Tcl_Interp * interp,
 				Tcl_Obj * cmdPtr, int flags);
 #endif
 #ifndef Tcl_RegisterChannel_TCL_DECLARED
 #define Tcl_RegisterChannel_TCL_DECLARED
 /* 210 */
-EXTERN void		Tcl_RegisterChannel (Tcl_Interp * interp, 
+EXTERN void		Tcl_RegisterChannel (Tcl_Interp * interp,
 				Tcl_Channel chan);
 #endif
 #ifndef Tcl_RegisterObjType_TCL_DECLARED
 #define Tcl_RegisterObjType_TCL_DECLARED
 /* 211 */
-EXTERN void		Tcl_RegisterObjType (CONST Tcl_ObjType * typePtr);
+EXTERN void		Tcl_RegisterObjType (const Tcl_ObjType * typePtr);
 #endif
 #ifndef Tcl_RegExpCompile_TCL_DECLARED
 #define Tcl_RegExpCompile_TCL_DECLARED
 /* 212 */
-EXTERN Tcl_RegExp	Tcl_RegExpCompile (Tcl_Interp * interp, 
-				CONST char * pattern);
+EXTERN Tcl_RegExp	Tcl_RegExpCompile (Tcl_Interp * interp,
+				const char * pattern);
 #endif
 #ifndef Tcl_RegExpExec_TCL_DECLARED
 #define Tcl_RegExpExec_TCL_DECLARED
 /* 213 */
-EXTERN int		Tcl_RegExpExec (Tcl_Interp * interp, 
-				Tcl_RegExp regexp, CONST char * text, 
-				CONST char * start);
+EXTERN int		Tcl_RegExpExec (Tcl_Interp * interp,
+				Tcl_RegExp regexp, const char * text,
+				const char * start);
 #endif
 #ifndef Tcl_RegExpMatch_TCL_DECLARED
 #define Tcl_RegExpMatch_TCL_DECLARED
 /* 214 */
-EXTERN int		Tcl_RegExpMatch (Tcl_Interp * interp, 
-				CONST char * text, CONST char * pattern);
+EXTERN int		Tcl_RegExpMatch (Tcl_Interp * interp,
+				const char * text, const char * pattern);
 #endif
 #ifndef Tcl_RegExpRange_TCL_DECLARED
 #define Tcl_RegExpRange_TCL_DECLARED
 /* 215 */
-EXTERN void		Tcl_RegExpRange (Tcl_RegExp regexp, int index, 
-				CONST84 char ** startPtr, 
+EXTERN void		Tcl_RegExpRange (Tcl_RegExp regexp, int index,
+				CONST84 char ** startPtr,
 				CONST84 char ** endPtr);
 #endif
 #ifndef Tcl_Release_TCL_DECLARED
@@ -1379,12 +1379,12 @@ EXTERN void		Tcl_ResetResult (Tcl_Interp * interp);
 #ifndef Tcl_ScanElement_TCL_DECLARED
 #define Tcl_ScanElement_TCL_DECLARED
 /* 218 */
-EXTERN int		Tcl_ScanElement (CONST char * str, int * flagPtr);
+EXTERN int		Tcl_ScanElement (const char * str, int * flagPtr);
 #endif
 #ifndef Tcl_ScanCountedElement_TCL_DECLARED
 #define Tcl_ScanCountedElement_TCL_DECLARED
 /* 219 */
-EXTERN int		Tcl_ScanCountedElement (CONST char * str, int length, 
+EXTERN int		Tcl_ScanCountedElement (const char * str, int length,
 				int * flagPtr);
 #endif
 #ifndef Tcl_SeekOld_TCL_DECLARED
@@ -1405,9 +1405,9 @@ EXTERN int		Tcl_ServiceEvent (int flags);
 #ifndef Tcl_SetAssocData_TCL_DECLARED
 #define Tcl_SetAssocData_TCL_DECLARED
 /* 223 */
-EXTERN void		Tcl_SetAssocData (Tcl_Interp * interp, 
-				CONST char * name, 
-				Tcl_InterpDeleteProc * proc, 
+EXTERN void		Tcl_SetAssocData (Tcl_Interp * interp,
+				const char * name,
+				Tcl_InterpDeleteProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_SetChannelBufferSize_TCL_DECLARED
@@ -1418,16 +1418,16 @@ EXTERN void		Tcl_SetChannelBufferSize (Tcl_Channel chan, int sz);
 #ifndef Tcl_SetChannelOption_TCL_DECLARED
 #define Tcl_SetChannelOption_TCL_DECLARED
 /* 225 */
-EXTERN int		Tcl_SetChannelOption (Tcl_Interp * interp, 
-				Tcl_Channel chan, CONST char * optionName, 
-				CONST char * newValue);
+EXTERN int		Tcl_SetChannelOption (Tcl_Interp * interp,
+				Tcl_Channel chan, const char * optionName,
+				const char * newValue);
 #endif
 #ifndef Tcl_SetCommandInfo_TCL_DECLARED
 #define Tcl_SetCommandInfo_TCL_DECLARED
 /* 226 */
-EXTERN int		Tcl_SetCommandInfo (Tcl_Interp * interp, 
-				CONST char * cmdName, 
-				CONST Tcl_CmdInfo * infoPtr);
+EXTERN int		Tcl_SetCommandInfo (Tcl_Interp * interp,
+				const char * cmdName,
+				const Tcl_CmdInfo * infoPtr);
 #endif
 #ifndef Tcl_SetErrno_TCL_DECLARED
 #define Tcl_SetErrno_TCL_DECLARED
@@ -1442,7 +1442,7 @@ EXTERN void		Tcl_SetErrorCode (Tcl_Interp * interp, ...);
 #ifndef Tcl_SetMaxBlockTime_TCL_DECLARED
 #define Tcl_SetMaxBlockTime_TCL_DECLARED
 /* 229 */
-EXTERN void		Tcl_SetMaxBlockTime (CONST Tcl_Time * timePtr);
+EXTERN void		Tcl_SetMaxBlockTime (const Tcl_Time * timePtr);
 #endif
 #ifndef Tcl_SetPanicProc_TCL_DECLARED
 #define Tcl_SetPanicProc_TCL_DECLARED
@@ -1452,13 +1452,13 @@ EXTERN void		Tcl_SetPanicProc (Tcl_PanicProc * panicProc);
 #ifndef Tcl_SetRecursionLimit_TCL_DECLARED
 #define Tcl_SetRecursionLimit_TCL_DECLARED
 /* 231 */
-EXTERN int		Tcl_SetRecursionLimit (Tcl_Interp * interp, 
+EXTERN int		Tcl_SetRecursionLimit (Tcl_Interp * interp,
 				int depth);
 #endif
 #ifndef Tcl_SetResult_TCL_DECLARED
 #define Tcl_SetResult_TCL_DECLARED
 /* 232 */
-EXTERN void		Tcl_SetResult (Tcl_Interp * interp, char * result, 
+EXTERN void		Tcl_SetResult (Tcl_Interp * interp, char * result,
 				Tcl_FreeProc * freeProc);
 #endif
 #ifndef Tcl_SetServiceMode_TCL_DECLARED
@@ -1469,13 +1469,13 @@ EXTERN int		Tcl_SetServiceMode (int mode);
 #ifndef Tcl_SetObjErrorCode_TCL_DECLARED
 #define Tcl_SetObjErrorCode_TCL_DECLARED
 /* 234 */
-EXTERN void		Tcl_SetObjErrorCode (Tcl_Interp * interp, 
+EXTERN void		Tcl_SetObjErrorCode (Tcl_Interp * interp,
 				Tcl_Obj * errorObjPtr);
 #endif
 #ifndef Tcl_SetObjResult_TCL_DECLARED
 #define Tcl_SetObjResult_TCL_DECLARED
 /* 235 */
-EXTERN void		Tcl_SetObjResult (Tcl_Interp * interp, 
+EXTERN void		Tcl_SetObjResult (Tcl_Interp * interp,
 				Tcl_Obj * resultObjPtr);
 #endif
 #ifndef Tcl_SetStdChannel_TCL_DECLARED
@@ -1486,16 +1486,16 @@ EXTERN void		Tcl_SetStdChannel (Tcl_Channel channel, int type);
 #ifndef Tcl_SetVar_TCL_DECLARED
 #define Tcl_SetVar_TCL_DECLARED
 /* 237 */
-EXTERN CONST84_RETURN char * Tcl_SetVar (Tcl_Interp * interp, 
-				CONST char * varName, CONST char * newValue, 
+EXTERN CONST84_RETURN char * Tcl_SetVar (Tcl_Interp * interp,
+				const char * varName, const char * newValue,
 				int flags);
 #endif
 #ifndef Tcl_SetVar2_TCL_DECLARED
 #define Tcl_SetVar2_TCL_DECLARED
 /* 238 */
-EXTERN CONST84_RETURN char * Tcl_SetVar2 (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
-				CONST char * newValue, int flags);
+EXTERN CONST84_RETURN char * Tcl_SetVar2 (Tcl_Interp * interp,
+				const char * part1, const char * part2,
+				const char * newValue, int flags);
 #endif
 #ifndef Tcl_SignalId_TCL_DECLARED
 #define Tcl_SignalId_TCL_DECLARED
@@ -1515,29 +1515,29 @@ EXTERN void		Tcl_SourceRCFile (Tcl_Interp * interp);
 #ifndef Tcl_SplitList_TCL_DECLARED
 #define Tcl_SplitList_TCL_DECLARED
 /* 242 */
-EXTERN int		Tcl_SplitList (Tcl_Interp * interp, 
-				CONST char * listStr, int * argcPtr, 
+EXTERN int		Tcl_SplitList (Tcl_Interp * interp,
+				const char * listStr, int * argcPtr,
 				CONST84 char *** argvPtr);
 #endif
 #ifndef Tcl_SplitPath_TCL_DECLARED
 #define Tcl_SplitPath_TCL_DECLARED
 /* 243 */
-EXTERN void		Tcl_SplitPath (CONST char * path, int * argcPtr, 
+EXTERN void		Tcl_SplitPath (const char * path, int * argcPtr,
 				CONST84 char *** argvPtr);
 #endif
 #ifndef Tcl_StaticPackage_TCL_DECLARED
 #define Tcl_StaticPackage_TCL_DECLARED
 /* 244 */
-EXTERN void		Tcl_StaticPackage (Tcl_Interp * interp, 
-				CONST char * pkgName, 
-				Tcl_PackageInitProc * initProc, 
+EXTERN void		Tcl_StaticPackage (Tcl_Interp * interp,
+				const char * pkgName,
+				Tcl_PackageInitProc * initProc,
 				Tcl_PackageInitProc * safeInitProc);
 #endif
 #ifndef Tcl_StringMatch_TCL_DECLARED
 #define Tcl_StringMatch_TCL_DECLARED
 /* 245 */
-EXTERN int		Tcl_StringMatch (CONST char * str, 
-				CONST char * pattern);
+EXTERN int		Tcl_StringMatch (const char * str,
+				const char * pattern);
 #endif
 #ifndef Tcl_TellOld_TCL_DECLARED
 #define Tcl_TellOld_TCL_DECLARED
@@ -1547,91 +1547,91 @@ EXTERN int		Tcl_TellOld (Tcl_Channel chan);
 #ifndef Tcl_TraceVar_TCL_DECLARED
 #define Tcl_TraceVar_TCL_DECLARED
 /* 247 */
-EXTERN int		Tcl_TraceVar (Tcl_Interp * interp, 
-				CONST char * varName, int flags, 
-				Tcl_VarTraceProc * proc, 
+EXTERN int		Tcl_TraceVar (Tcl_Interp * interp,
+				const char * varName, int flags,
+				Tcl_VarTraceProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_TraceVar2_TCL_DECLARED
 #define Tcl_TraceVar2_TCL_DECLARED
 /* 248 */
-EXTERN int		Tcl_TraceVar2 (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
-				int flags, Tcl_VarTraceProc * proc, 
+EXTERN int		Tcl_TraceVar2 (Tcl_Interp * interp,
+				const char * part1, const char * part2,
+				int flags, Tcl_VarTraceProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_TranslateFileName_TCL_DECLARED
 #define Tcl_TranslateFileName_TCL_DECLARED
 /* 249 */
-EXTERN char *		Tcl_TranslateFileName (Tcl_Interp * interp, 
-				CONST char * name, Tcl_DString * bufferPtr);
+EXTERN char *		Tcl_TranslateFileName (Tcl_Interp * interp,
+				const char * name, Tcl_DString * bufferPtr);
 #endif
 #ifndef Tcl_Ungets_TCL_DECLARED
 #define Tcl_Ungets_TCL_DECLARED
 /* 250 */
-EXTERN int		Tcl_Ungets (Tcl_Channel chan, CONST char * str, 
+EXTERN int		Tcl_Ungets (Tcl_Channel chan, const char * str,
 				int len, int atHead);
 #endif
 #ifndef Tcl_UnlinkVar_TCL_DECLARED
 #define Tcl_UnlinkVar_TCL_DECLARED
 /* 251 */
-EXTERN void		Tcl_UnlinkVar (Tcl_Interp * interp, 
-				CONST char * varName);
+EXTERN void		Tcl_UnlinkVar (Tcl_Interp * interp,
+				const char * varName);
 #endif
 #ifndef Tcl_UnregisterChannel_TCL_DECLARED
 #define Tcl_UnregisterChannel_TCL_DECLARED
 /* 252 */
-EXTERN int		Tcl_UnregisterChannel (Tcl_Interp * interp, 
+EXTERN int		Tcl_UnregisterChannel (Tcl_Interp * interp,
 				Tcl_Channel chan);
 #endif
 #ifndef Tcl_UnsetVar_TCL_DECLARED
 #define Tcl_UnsetVar_TCL_DECLARED
 /* 253 */
-EXTERN int		Tcl_UnsetVar (Tcl_Interp * interp, 
-				CONST char * varName, int flags);
+EXTERN int		Tcl_UnsetVar (Tcl_Interp * interp,
+				const char * varName, int flags);
 #endif
 #ifndef Tcl_UnsetVar2_TCL_DECLARED
 #define Tcl_UnsetVar2_TCL_DECLARED
 /* 254 */
-EXTERN int		Tcl_UnsetVar2 (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
+EXTERN int		Tcl_UnsetVar2 (Tcl_Interp * interp,
+				const char * part1, const char * part2,
 				int flags);
 #endif
 #ifndef Tcl_UntraceVar_TCL_DECLARED
 #define Tcl_UntraceVar_TCL_DECLARED
 /* 255 */
-EXTERN void		Tcl_UntraceVar (Tcl_Interp * interp, 
-				CONST char * varName, int flags, 
-				Tcl_VarTraceProc * proc, 
+EXTERN void		Tcl_UntraceVar (Tcl_Interp * interp,
+				const char * varName, int flags,
+				Tcl_VarTraceProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_UntraceVar2_TCL_DECLARED
 #define Tcl_UntraceVar2_TCL_DECLARED
 /* 256 */
-EXTERN void		Tcl_UntraceVar2 (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
-				int flags, Tcl_VarTraceProc * proc, 
+EXTERN void		Tcl_UntraceVar2 (Tcl_Interp * interp,
+				const char * part1, const char * part2,
+				int flags, Tcl_VarTraceProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_UpdateLinkedVar_TCL_DECLARED
 #define Tcl_UpdateLinkedVar_TCL_DECLARED
 /* 257 */
-EXTERN void		Tcl_UpdateLinkedVar (Tcl_Interp * interp, 
-				CONST char * varName);
+EXTERN void		Tcl_UpdateLinkedVar (Tcl_Interp * interp,
+				const char * varName);
 #endif
 #ifndef Tcl_UpVar_TCL_DECLARED
 #define Tcl_UpVar_TCL_DECLARED
 /* 258 */
-EXTERN int		Tcl_UpVar (Tcl_Interp * interp, 
-				CONST char * frameName, CONST char * varName, 
-				CONST char * localName, int flags);
+EXTERN int		Tcl_UpVar (Tcl_Interp * interp,
+				const char * frameName, const char * varName,
+				const char * localName, int flags);
 #endif
 #ifndef Tcl_UpVar2_TCL_DECLARED
 #define Tcl_UpVar2_TCL_DECLARED
 /* 259 */
-EXTERN int		Tcl_UpVar2 (Tcl_Interp * interp, 
-				CONST char * frameName, CONST char * part1, 
-				CONST char * part2, CONST char * localName, 
+EXTERN int		Tcl_UpVar2 (Tcl_Interp * interp,
+				const char * frameName, const char * part1,
+				const char * part2, const char * localName,
 				int flags);
 #endif
 #ifndef Tcl_VarEval_TCL_DECLARED
@@ -1642,51 +1642,51 @@ EXTERN int		Tcl_VarEval (Tcl_Interp * interp, ...);
 #ifndef Tcl_VarTraceInfo_TCL_DECLARED
 #define Tcl_VarTraceInfo_TCL_DECLARED
 /* 261 */
-EXTERN ClientData	Tcl_VarTraceInfo (Tcl_Interp * interp, 
-				CONST char * varName, int flags, 
-				Tcl_VarTraceProc * procPtr, 
+EXTERN ClientData	Tcl_VarTraceInfo (Tcl_Interp * interp,
+				const char * varName, int flags,
+				Tcl_VarTraceProc * procPtr,
 				ClientData prevClientData);
 #endif
 #ifndef Tcl_VarTraceInfo2_TCL_DECLARED
 #define Tcl_VarTraceInfo2_TCL_DECLARED
 /* 262 */
-EXTERN ClientData	Tcl_VarTraceInfo2 (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
-				int flags, Tcl_VarTraceProc * procPtr, 
+EXTERN ClientData	Tcl_VarTraceInfo2 (Tcl_Interp * interp,
+				const char * part1, const char * part2,
+				int flags, Tcl_VarTraceProc * procPtr,
 				ClientData prevClientData);
 #endif
 #ifndef Tcl_Write_TCL_DECLARED
 #define Tcl_Write_TCL_DECLARED
 /* 263 */
-EXTERN int		Tcl_Write (Tcl_Channel chan, CONST char * s, 
+EXTERN int		Tcl_Write (Tcl_Channel chan, const char * s,
 				int slen);
 #endif
 #ifndef Tcl_WrongNumArgs_TCL_DECLARED
 #define Tcl_WrongNumArgs_TCL_DECLARED
 /* 264 */
-EXTERN void		Tcl_WrongNumArgs (Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[], CONST char * message);
+EXTERN void		Tcl_WrongNumArgs (Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[], const char * message);
 #endif
 #ifndef Tcl_DumpActiveMemory_TCL_DECLARED
 #define Tcl_DumpActiveMemory_TCL_DECLARED
 /* 265 */
-EXTERN int		Tcl_DumpActiveMemory (CONST char * fileName);
+EXTERN int		Tcl_DumpActiveMemory (const char * fileName);
 #endif
 #ifndef Tcl_ValidateAllMemory_TCL_DECLARED
 #define Tcl_ValidateAllMemory_TCL_DECLARED
 /* 266 */
-EXTERN void		Tcl_ValidateAllMemory (CONST char * file, int line);
+EXTERN void		Tcl_ValidateAllMemory (const char * file, int line);
 #endif
 #ifndef Tcl_AppendResultVA_TCL_DECLARED
 #define Tcl_AppendResultVA_TCL_DECLARED
 /* 267 */
-EXTERN void		Tcl_AppendResultVA (Tcl_Interp * interp, 
+EXTERN void		Tcl_AppendResultVA (Tcl_Interp * interp,
 				va_list argList);
 #endif
 #ifndef Tcl_AppendStringsToObjVA_TCL_DECLARED
 #define Tcl_AppendStringsToObjVA_TCL_DECLARED
 /* 268 */
-EXTERN void		Tcl_AppendStringsToObjVA (Tcl_Obj * objPtr, 
+EXTERN void		Tcl_AppendStringsToObjVA (Tcl_Obj * objPtr,
 				va_list argList);
 #endif
 #ifndef Tcl_HashStats_TCL_DECLARED
@@ -1697,40 +1697,40 @@ EXTERN CONST84_RETURN char * Tcl_HashStats (Tcl_HashTable * tablePtr);
 #ifndef Tcl_ParseVar_TCL_DECLARED
 #define Tcl_ParseVar_TCL_DECLARED
 /* 270 */
-EXTERN CONST84_RETURN char * Tcl_ParseVar (Tcl_Interp * interp, 
-				CONST char * start, CONST84 char ** termPtr);
+EXTERN CONST84_RETURN char * Tcl_ParseVar (Tcl_Interp * interp,
+				const char * start, CONST84 char ** termPtr);
 #endif
 #ifndef Tcl_PkgPresent_TCL_DECLARED
 #define Tcl_PkgPresent_TCL_DECLARED
 /* 271 */
-EXTERN CONST84_RETURN char * Tcl_PkgPresent (Tcl_Interp * interp, 
-				CONST char * name, CONST char * version, 
+EXTERN CONST84_RETURN char * Tcl_PkgPresent (Tcl_Interp * interp,
+				const char * name, const char * version,
 				int exact);
 #endif
 #ifndef Tcl_PkgPresentEx_TCL_DECLARED
 #define Tcl_PkgPresentEx_TCL_DECLARED
 /* 272 */
-EXTERN CONST84_RETURN char * Tcl_PkgPresentEx (Tcl_Interp * interp, 
-				CONST char * name, CONST char * version, 
+EXTERN CONST84_RETURN char * Tcl_PkgPresentEx (Tcl_Interp * interp,
+				const char * name, const char * version,
 				int exact, ClientData * clientDataPtr);
 #endif
 #ifndef Tcl_PkgProvide_TCL_DECLARED
 #define Tcl_PkgProvide_TCL_DECLARED
 /* 273 */
-EXTERN int		Tcl_PkgProvide (Tcl_Interp * interp, 
-				CONST char * name, CONST char * version);
+EXTERN int		Tcl_PkgProvide (Tcl_Interp * interp,
+				const char * name, const char * version);
 #endif
 #ifndef Tcl_PkgRequire_TCL_DECLARED
 #define Tcl_PkgRequire_TCL_DECLARED
 /* 274 */
-EXTERN CONST84_RETURN char * Tcl_PkgRequire (Tcl_Interp * interp, 
-				CONST char * name, CONST char * version, 
+EXTERN CONST84_RETURN char * Tcl_PkgRequire (Tcl_Interp * interp,
+				const char * name, const char * version,
 				int exact);
 #endif
 #ifndef Tcl_SetErrorCodeVA_TCL_DECLARED
 #define Tcl_SetErrorCodeVA_TCL_DECLARED
 /* 275 */
-EXTERN void		Tcl_SetErrorCodeVA (Tcl_Interp * interp, 
+EXTERN void		Tcl_SetErrorCodeVA (Tcl_Interp * interp,
 				va_list argList);
 #endif
 #ifndef Tcl_VarEvalVA_TCL_DECLARED
@@ -1746,12 +1746,12 @@ EXTERN Tcl_Pid		Tcl_WaitPid (Tcl_Pid pid, int * statPtr, int options);
 #ifndef Tcl_PanicVA_TCL_DECLARED
 #define Tcl_PanicVA_TCL_DECLARED
 /* 278 */
-EXTERN void		Tcl_PanicVA (CONST char * format, va_list argList);
+EXTERN void		Tcl_PanicVA (const char * format, va_list argList);
 #endif
 #ifndef Tcl_GetVersion_TCL_DECLARED
 #define Tcl_GetVersion_TCL_DECLARED
 /* 279 */
-EXTERN void		Tcl_GetVersion (int * major, int * minor, 
+EXTERN void		Tcl_GetVersion (int * major, int * minor,
 				int * patchLevel, int * type);
 #endif
 #ifndef Tcl_InitMemory_TCL_DECLARED
@@ -1762,15 +1762,15 @@ EXTERN void		Tcl_InitMemory (Tcl_Interp * interp);
 #ifndef Tcl_StackChannel_TCL_DECLARED
 #define Tcl_StackChannel_TCL_DECLARED
 /* 281 */
-EXTERN Tcl_Channel	Tcl_StackChannel (Tcl_Interp * interp, 
-				CONST Tcl_ChannelType * typePtr, 
-				ClientData instanceData, int mask, 
+EXTERN Tcl_Channel	Tcl_StackChannel (Tcl_Interp * interp,
+				const Tcl_ChannelType * typePtr,
+				ClientData instanceData, int mask,
 				Tcl_Channel prevChan);
 #endif
 #ifndef Tcl_UnstackChannel_TCL_DECLARED
 #define Tcl_UnstackChannel_TCL_DECLARED
 /* 282 */
-EXTERN int		Tcl_UnstackChannel (Tcl_Interp * interp, 
+EXTERN int		Tcl_UnstackChannel (Tcl_Interp * interp,
 				Tcl_Channel chan);
 #endif
 #ifndef Tcl_GetStackedChannel_TCL_DECLARED
@@ -1787,24 +1787,24 @@ EXTERN void		Tcl_SetMainLoop (Tcl_MainLoopProc * proc);
 #ifndef Tcl_AppendObjToObj_TCL_DECLARED
 #define Tcl_AppendObjToObj_TCL_DECLARED
 /* 286 */
-EXTERN void		Tcl_AppendObjToObj (Tcl_Obj * objPtr, 
+EXTERN void		Tcl_AppendObjToObj (Tcl_Obj * objPtr,
 				Tcl_Obj * appendObjPtr);
 #endif
 #ifndef Tcl_CreateEncoding_TCL_DECLARED
 #define Tcl_CreateEncoding_TCL_DECLARED
 /* 287 */
-EXTERN Tcl_Encoding	Tcl_CreateEncoding (CONST Tcl_EncodingType * typePtr);
+EXTERN Tcl_Encoding	Tcl_CreateEncoding (const Tcl_EncodingType * typePtr);
 #endif
 #ifndef Tcl_CreateThreadExitHandler_TCL_DECLARED
 #define Tcl_CreateThreadExitHandler_TCL_DECLARED
 /* 288 */
-EXTERN void		Tcl_CreateThreadExitHandler (Tcl_ExitProc * proc, 
+EXTERN void		Tcl_CreateThreadExitHandler (Tcl_ExitProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteThreadExitHandler_TCL_DECLARED
 #define Tcl_DeleteThreadExitHandler_TCL_DECLARED
 /* 289 */
-EXTERN void		Tcl_DeleteThreadExitHandler (Tcl_ExitProc * proc, 
+EXTERN void		Tcl_DeleteThreadExitHandler (Tcl_ExitProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DiscardResult_TCL_DECLARED
@@ -1815,19 +1815,19 @@ EXTERN void		Tcl_DiscardResult (Tcl_SavedResult * statePtr);
 #ifndef Tcl_EvalEx_TCL_DECLARED
 #define Tcl_EvalEx_TCL_DECLARED
 /* 291 */
-EXTERN int		Tcl_EvalEx (Tcl_Interp * interp, CONST char * script, 
+EXTERN int		Tcl_EvalEx (Tcl_Interp * interp, const char * script,
 				int numBytes, int flags);
 #endif
 #ifndef Tcl_EvalObjv_TCL_DECLARED
 #define Tcl_EvalObjv_TCL_DECLARED
 /* 292 */
-EXTERN int		Tcl_EvalObjv (Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[], int flags);
+EXTERN int		Tcl_EvalObjv (Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[], int flags);
 #endif
 #ifndef Tcl_EvalObjEx_TCL_DECLARED
 #define Tcl_EvalObjEx_TCL_DECLARED
 /* 293 */
-EXTERN int		Tcl_EvalObjEx (Tcl_Interp * interp, Tcl_Obj * objPtr, 
+EXTERN int		Tcl_EvalObjEx (Tcl_Interp * interp, Tcl_Obj * objPtr,
 				int flags);
 #endif
 #ifndef Tcl_ExitThread_TCL_DECLARED
@@ -1838,18 +1838,18 @@ EXTERN void		Tcl_ExitThread (int status);
 #ifndef Tcl_ExternalToUtf_TCL_DECLARED
 #define Tcl_ExternalToUtf_TCL_DECLARED
 /* 295 */
-EXTERN int		Tcl_ExternalToUtf (Tcl_Interp * interp, 
-				Tcl_Encoding encoding, CONST char * src, 
-				int srcLen, int flags, 
-				Tcl_EncodingState * statePtr, char * dst, 
-				int dstLen, int * srcReadPtr, 
+EXTERN int		Tcl_ExternalToUtf (Tcl_Interp * interp,
+				Tcl_Encoding encoding, const char * src,
+				int srcLen, int flags,
+				Tcl_EncodingState * statePtr, char * dst,
+				int dstLen, int * srcReadPtr,
 				int * dstWrotePtr, int * dstCharsPtr);
 #endif
 #ifndef Tcl_ExternalToUtfDString_TCL_DECLARED
 #define Tcl_ExternalToUtfDString_TCL_DECLARED
 /* 296 */
-EXTERN char *		Tcl_ExternalToUtfDString (Tcl_Encoding encoding, 
-				CONST char * src, int srcLen, 
+EXTERN char *		Tcl_ExternalToUtfDString (Tcl_Encoding encoding,
+				const char * src, int srcLen,
 				Tcl_DString * dsPtr);
 #endif
 #ifndef Tcl_FinalizeThread_TCL_DECLARED
@@ -1875,8 +1875,8 @@ EXTERN Tcl_ThreadId	Tcl_GetCurrentThread (void);
 #ifndef Tcl_GetEncoding_TCL_DECLARED
 #define Tcl_GetEncoding_TCL_DECLARED
 /* 301 */
-EXTERN Tcl_Encoding	Tcl_GetEncoding (Tcl_Interp * interp, 
-				CONST char * name);
+EXTERN Tcl_Encoding	Tcl_GetEncoding (Tcl_Interp * interp,
+				const char * name);
 #endif
 #ifndef Tcl_GetEncodingName_TCL_DECLARED
 #define Tcl_GetEncodingName_TCL_DECLARED
@@ -1891,22 +1891,22 @@ EXTERN void		Tcl_GetEncodingNames (Tcl_Interp * interp);
 #ifndef Tcl_GetIndexFromObjStruct_TCL_DECLARED
 #define Tcl_GetIndexFromObjStruct_TCL_DECLARED
 /* 304 */
-EXTERN int		Tcl_GetIndexFromObjStruct (Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, CONST VOID * tablePtr, 
-				int offset, CONST char * msg, int flags, 
+EXTERN int		Tcl_GetIndexFromObjStruct (Tcl_Interp * interp,
+				Tcl_Obj * objPtr, const VOID * tablePtr,
+				int offset, const char * msg, int flags,
 				int * indexPtr);
 #endif
 #ifndef Tcl_GetThreadData_TCL_DECLARED
 #define Tcl_GetThreadData_TCL_DECLARED
 /* 305 */
-EXTERN VOID *		Tcl_GetThreadData (Tcl_ThreadDataKey * keyPtr, 
+EXTERN VOID *		Tcl_GetThreadData (Tcl_ThreadDataKey * keyPtr,
 				int size);
 #endif
 #ifndef Tcl_GetVar2Ex_TCL_DECLARED
 #define Tcl_GetVar2Ex_TCL_DECLARED
 /* 306 */
-EXTERN Tcl_Obj *	Tcl_GetVar2Ex (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
+EXTERN Tcl_Obj *	Tcl_GetVar2Ex (Tcl_Interp * interp,
+				const char * part1, const char * part2,
 				int flags);
 #endif
 #ifndef Tcl_InitNotifier_TCL_DECLARED
@@ -1932,44 +1932,44 @@ EXTERN void		Tcl_ConditionNotify (Tcl_Condition * condPtr);
 #ifndef Tcl_ConditionWait_TCL_DECLARED
 #define Tcl_ConditionWait_TCL_DECLARED
 /* 311 */
-EXTERN void		Tcl_ConditionWait (Tcl_Condition * condPtr, 
-				Tcl_Mutex * mutexPtr, 
-				CONST Tcl_Time * timePtr);
+EXTERN void		Tcl_ConditionWait (Tcl_Condition * condPtr,
+				Tcl_Mutex * mutexPtr,
+				const Tcl_Time * timePtr);
 #endif
 #ifndef Tcl_NumUtfChars_TCL_DECLARED
 #define Tcl_NumUtfChars_TCL_DECLARED
 /* 312 */
-EXTERN int		Tcl_NumUtfChars (CONST char * src, int length);
+EXTERN int		Tcl_NumUtfChars (const char * src, int length);
 #endif
 #ifndef Tcl_ReadChars_TCL_DECLARED
 #define Tcl_ReadChars_TCL_DECLARED
 /* 313 */
-EXTERN int		Tcl_ReadChars (Tcl_Channel channel, Tcl_Obj * objPtr, 
+EXTERN int		Tcl_ReadChars (Tcl_Channel channel, Tcl_Obj * objPtr,
 				int charsToRead, int appendFlag);
 #endif
 #ifndef Tcl_RestoreResult_TCL_DECLARED
 #define Tcl_RestoreResult_TCL_DECLARED
 /* 314 */
-EXTERN void		Tcl_RestoreResult (Tcl_Interp * interp, 
+EXTERN void		Tcl_RestoreResult (Tcl_Interp * interp,
 				Tcl_SavedResult * statePtr);
 #endif
 #ifndef Tcl_SaveResult_TCL_DECLARED
 #define Tcl_SaveResult_TCL_DECLARED
 /* 315 */
-EXTERN void		Tcl_SaveResult (Tcl_Interp * interp, 
+EXTERN void		Tcl_SaveResult (Tcl_Interp * interp,
 				Tcl_SavedResult * statePtr);
 #endif
 #ifndef Tcl_SetSystemEncoding_TCL_DECLARED
 #define Tcl_SetSystemEncoding_TCL_DECLARED
 /* 316 */
-EXTERN int		Tcl_SetSystemEncoding (Tcl_Interp * interp, 
-				CONST char * name);
+EXTERN int		Tcl_SetSystemEncoding (Tcl_Interp * interp,
+				const char * name);
 #endif
 #ifndef Tcl_SetVar2Ex_TCL_DECLARED
 #define Tcl_SetVar2Ex_TCL_DECLARED
 /* 317 */
-EXTERN Tcl_Obj *	Tcl_SetVar2Ex (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
+EXTERN Tcl_Obj *	Tcl_SetVar2Ex (Tcl_Interp * interp,
+				const char * part1, const char * part2,
 				Tcl_Obj * newValuePtr, int flags);
 #endif
 #ifndef Tcl_ThreadAlert_TCL_DECLARED
@@ -1980,13 +1980,13 @@ EXTERN void		Tcl_ThreadAlert (Tcl_ThreadId threadId);
 #ifndef Tcl_ThreadQueueEvent_TCL_DECLARED
 #define Tcl_ThreadQueueEvent_TCL_DECLARED
 /* 319 */
-EXTERN void		Tcl_ThreadQueueEvent (Tcl_ThreadId threadId, 
+EXTERN void		Tcl_ThreadQueueEvent (Tcl_ThreadId threadId,
 				Tcl_Event* evPtr, Tcl_QueuePosition position);
 #endif
 #ifndef Tcl_UniCharAtIndex_TCL_DECLARED
 #define Tcl_UniCharAtIndex_TCL_DECLARED
 /* 320 */
-EXTERN Tcl_UniChar	Tcl_UniCharAtIndex (CONST char * src, int index);
+EXTERN Tcl_UniChar	Tcl_UniCharAtIndex (const char * src, int index);
 #endif
 #ifndef Tcl_UniCharToLower_TCL_DECLARED
 #define Tcl_UniCharToLower_TCL_DECLARED
@@ -2011,55 +2011,55 @@ EXTERN int		Tcl_UniCharToUtf (int ch, char * buf);
 #ifndef Tcl_UtfAtIndex_TCL_DECLARED
 #define Tcl_UtfAtIndex_TCL_DECLARED
 /* 325 */
-EXTERN CONST84_RETURN char * Tcl_UtfAtIndex (CONST char * src, int index);
+EXTERN CONST84_RETURN char * Tcl_UtfAtIndex (const char * src, int index);
 #endif
 #ifndef Tcl_UtfCharComplete_TCL_DECLARED
 #define Tcl_UtfCharComplete_TCL_DECLARED
 /* 326 */
-EXTERN int		Tcl_UtfCharComplete (CONST char * src, int length);
+EXTERN int		Tcl_UtfCharComplete (const char * src, int length);
 #endif
 #ifndef Tcl_UtfBackslash_TCL_DECLARED
 #define Tcl_UtfBackslash_TCL_DECLARED
 /* 327 */
-EXTERN int		Tcl_UtfBackslash (CONST char * src, int * readPtr, 
+EXTERN int		Tcl_UtfBackslash (const char * src, int * readPtr,
 				char * dst);
 #endif
 #ifndef Tcl_UtfFindFirst_TCL_DECLARED
 #define Tcl_UtfFindFirst_TCL_DECLARED
 /* 328 */
-EXTERN CONST84_RETURN char * Tcl_UtfFindFirst (CONST char * src, int ch);
+EXTERN CONST84_RETURN char * Tcl_UtfFindFirst (const char * src, int ch);
 #endif
 #ifndef Tcl_UtfFindLast_TCL_DECLARED
 #define Tcl_UtfFindLast_TCL_DECLARED
 /* 329 */
-EXTERN CONST84_RETURN char * Tcl_UtfFindLast (CONST char * src, int ch);
+EXTERN CONST84_RETURN char * Tcl_UtfFindLast (const char * src, int ch);
 #endif
 #ifndef Tcl_UtfNext_TCL_DECLARED
 #define Tcl_UtfNext_TCL_DECLARED
 /* 330 */
-EXTERN CONST84_RETURN char * Tcl_UtfNext (CONST char * src);
+EXTERN CONST84_RETURN char * Tcl_UtfNext (const char * src);
 #endif
 #ifndef Tcl_UtfPrev_TCL_DECLARED
 #define Tcl_UtfPrev_TCL_DECLARED
 /* 331 */
-EXTERN CONST84_RETURN char * Tcl_UtfPrev (CONST char * src, 
-				CONST char * start);
+EXTERN CONST84_RETURN char * Tcl_UtfPrev (const char * src,
+				const char * start);
 #endif
 #ifndef Tcl_UtfToExternal_TCL_DECLARED
 #define Tcl_UtfToExternal_TCL_DECLARED
 /* 332 */
-EXTERN int		Tcl_UtfToExternal (Tcl_Interp * interp, 
-				Tcl_Encoding encoding, CONST char * src, 
-				int srcLen, int flags, 
-				Tcl_EncodingState * statePtr, char * dst, 
-				int dstLen, int * srcReadPtr, 
+EXTERN int		Tcl_UtfToExternal (Tcl_Interp * interp,
+				Tcl_Encoding encoding, const char * src,
+				int srcLen, int flags,
+				Tcl_EncodingState * statePtr, char * dst,
+				int dstLen, int * srcReadPtr,
 				int * dstWrotePtr, int * dstCharsPtr);
 #endif
 #ifndef Tcl_UtfToExternalDString_TCL_DECLARED
 #define Tcl_UtfToExternalDString_TCL_DECLARED
 /* 333 */
-EXTERN char *		Tcl_UtfToExternalDString (Tcl_Encoding encoding, 
-				CONST char * src, int srcLen, 
+EXTERN char *		Tcl_UtfToExternalDString (Tcl_Encoding encoding,
+				const char * src, int srcLen,
 				Tcl_DString * dsPtr);
 #endif
 #ifndef Tcl_UtfToLower_TCL_DECLARED
@@ -2075,7 +2075,7 @@ EXTERN int		Tcl_UtfToTitle (char * src);
 #ifndef Tcl_UtfToUniChar_TCL_DECLARED
 #define Tcl_UtfToUniChar_TCL_DECLARED
 /* 336 */
-EXTERN int		Tcl_UtfToUniChar (CONST char * src, 
+EXTERN int		Tcl_UtfToUniChar (const char * src,
 				Tcl_UniChar * chPtr);
 #endif
 #ifndef Tcl_UtfToUpper_TCL_DECLARED
@@ -2086,7 +2086,7 @@ EXTERN int		Tcl_UtfToUpper (char * src);
 #ifndef Tcl_WriteChars_TCL_DECLARED
 #define Tcl_WriteChars_TCL_DECLARED
 /* 338 */
-EXTERN int		Tcl_WriteChars (Tcl_Channel chan, CONST char * src, 
+EXTERN int		Tcl_WriteChars (Tcl_Channel chan, const char * src,
 				int srcLen);
 #endif
 #ifndef Tcl_WriteObj_TCL_DECLARED
@@ -2107,7 +2107,7 @@ EXTERN CONST84_RETURN char * Tcl_GetDefaultEncodingDir (void);
 #ifndef Tcl_SetDefaultEncodingDir_TCL_DECLARED
 #define Tcl_SetDefaultEncodingDir_TCL_DECLARED
 /* 342 */
-EXTERN void		Tcl_SetDefaultEncodingDir (CONST char * path);
+EXTERN void		Tcl_SetDefaultEncodingDir (const char * path);
 #endif
 #ifndef Tcl_AlertNotifier_TCL_DECLARED
 #define Tcl_AlertNotifier_TCL_DECLARED
@@ -2157,37 +2157,37 @@ EXTERN int		Tcl_UniCharIsWordChar (int ch);
 #ifndef Tcl_UniCharLen_TCL_DECLARED
 #define Tcl_UniCharLen_TCL_DECLARED
 /* 352 */
-EXTERN int		Tcl_UniCharLen (CONST Tcl_UniChar * uniStr);
+EXTERN int		Tcl_UniCharLen (const Tcl_UniChar * uniStr);
 #endif
 #ifndef Tcl_UniCharNcmp_TCL_DECLARED
 #define Tcl_UniCharNcmp_TCL_DECLARED
 /* 353 */
-EXTERN int		Tcl_UniCharNcmp (CONST Tcl_UniChar * ucs, 
-				CONST Tcl_UniChar * uct, 
+EXTERN int		Tcl_UniCharNcmp (const Tcl_UniChar * ucs,
+				const Tcl_UniChar * uct,
 				unsigned long numChars);
 #endif
 #ifndef Tcl_UniCharToUtfDString_TCL_DECLARED
 #define Tcl_UniCharToUtfDString_TCL_DECLARED
 /* 354 */
-EXTERN char *		Tcl_UniCharToUtfDString (CONST Tcl_UniChar * uniStr, 
+EXTERN char *		Tcl_UniCharToUtfDString (const Tcl_UniChar * uniStr,
 				int uniLength, Tcl_DString * dsPtr);
 #endif
 #ifndef Tcl_UtfToUniCharDString_TCL_DECLARED
 #define Tcl_UtfToUniCharDString_TCL_DECLARED
 /* 355 */
-EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString (CONST char * src, 
+EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString (const char * src,
 				int length, Tcl_DString * dsPtr);
 #endif
 #ifndef Tcl_GetRegExpFromObj_TCL_DECLARED
 #define Tcl_GetRegExpFromObj_TCL_DECLARED
 /* 356 */
-EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj (Tcl_Interp * interp, 
+EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj (Tcl_Interp * interp,
 				Tcl_Obj * patObj, int flags);
 #endif
 #ifndef Tcl_EvalTokens_TCL_DECLARED
 #define Tcl_EvalTokens_TCL_DECLARED
 /* 357 */
-EXTERN Tcl_Obj *	Tcl_EvalTokens (Tcl_Interp * interp, 
+EXTERN Tcl_Obj *	Tcl_EvalTokens (Tcl_Interp * interp,
 				Tcl_Token * tokenPtr, int count);
 #endif
 #ifndef Tcl_FreeParse_TCL_DECLARED
@@ -2198,85 +2198,85 @@ EXTERN void		Tcl_FreeParse (Tcl_Parse * parsePtr);
 #ifndef Tcl_LogCommandInfo_TCL_DECLARED
 #define Tcl_LogCommandInfo_TCL_DECLARED
 /* 359 */
-EXTERN void		Tcl_LogCommandInfo (Tcl_Interp * interp, 
-				CONST char * script, CONST char * command, 
+EXTERN void		Tcl_LogCommandInfo (Tcl_Interp * interp,
+				const char * script, const char * command,
 				int length);
 #endif
 #ifndef Tcl_ParseBraces_TCL_DECLARED
 #define Tcl_ParseBraces_TCL_DECLARED
 /* 360 */
-EXTERN int		Tcl_ParseBraces (Tcl_Interp * interp, 
-				CONST char * start, int numBytes, 
-				Tcl_Parse * parsePtr, int append, 
+EXTERN int		Tcl_ParseBraces (Tcl_Interp * interp,
+				const char * start, int numBytes,
+				Tcl_Parse * parsePtr, int append,
 				CONST84 char ** termPtr);
 #endif
 #ifndef Tcl_ParseCommand_TCL_DECLARED
 #define Tcl_ParseCommand_TCL_DECLARED
 /* 361 */
-EXTERN int		Tcl_ParseCommand (Tcl_Interp * interp, 
-				CONST char * start, int numBytes, int nested, 
+EXTERN int		Tcl_ParseCommand (Tcl_Interp * interp,
+				const char * start, int numBytes, int nested,
 				Tcl_Parse * parsePtr);
 #endif
 #ifndef Tcl_ParseExpr_TCL_DECLARED
 #define Tcl_ParseExpr_TCL_DECLARED
 /* 362 */
-EXTERN int		Tcl_ParseExpr (Tcl_Interp * interp, 
-				CONST char * start, int numBytes, 
+EXTERN int		Tcl_ParseExpr (Tcl_Interp * interp,
+				const char * start, int numBytes,
 				Tcl_Parse * parsePtr);
 #endif
 #ifndef Tcl_ParseQuotedString_TCL_DECLARED
 #define Tcl_ParseQuotedString_TCL_DECLARED
 /* 363 */
-EXTERN int		Tcl_ParseQuotedString (Tcl_Interp * interp, 
-				CONST char * start, int numBytes, 
-				Tcl_Parse * parsePtr, int append, 
+EXTERN int		Tcl_ParseQuotedString (Tcl_Interp * interp,
+				const char * start, int numBytes,
+				Tcl_Parse * parsePtr, int append,
 				CONST84 char ** termPtr);
 #endif
 #ifndef Tcl_ParseVarName_TCL_DECLARED
 #define Tcl_ParseVarName_TCL_DECLARED
 /* 364 */
-EXTERN int		Tcl_ParseVarName (Tcl_Interp * interp, 
-				CONST char * start, int numBytes, 
+EXTERN int		Tcl_ParseVarName (Tcl_Interp * interp,
+				const char * start, int numBytes,
 				Tcl_Parse * parsePtr, int append);
 #endif
 #ifndef Tcl_GetCwd_TCL_DECLARED
 #define Tcl_GetCwd_TCL_DECLARED
 /* 365 */
-EXTERN char *		Tcl_GetCwd (Tcl_Interp * interp, 
+EXTERN char *		Tcl_GetCwd (Tcl_Interp * interp,
 				Tcl_DString * cwdPtr);
 #endif
 #ifndef Tcl_Chdir_TCL_DECLARED
 #define Tcl_Chdir_TCL_DECLARED
 /* 366 */
-EXTERN int		Tcl_Chdir (CONST char * dirName);
+EXTERN int		Tcl_Chdir (const char * dirName);
 #endif
 #ifndef Tcl_Access_TCL_DECLARED
 #define Tcl_Access_TCL_DECLARED
 /* 367 */
-EXTERN int		Tcl_Access (CONST char * path, int mode);
+EXTERN int		Tcl_Access (const char * path, int mode);
 #endif
 #ifndef Tcl_Stat_TCL_DECLARED
 #define Tcl_Stat_TCL_DECLARED
 /* 368 */
-EXTERN int		Tcl_Stat (CONST char * path, struct stat * bufPtr);
+EXTERN int		Tcl_Stat (const char * path, struct stat * bufPtr);
 #endif
 #ifndef Tcl_UtfNcmp_TCL_DECLARED
 #define Tcl_UtfNcmp_TCL_DECLARED
 /* 369 */
-EXTERN int		Tcl_UtfNcmp (CONST char * s1, CONST char * s2, 
+EXTERN int		Tcl_UtfNcmp (const char * s1, const char * s2,
 				unsigned long n);
 #endif
 #ifndef Tcl_UtfNcasecmp_TCL_DECLARED
 #define Tcl_UtfNcasecmp_TCL_DECLARED
 /* 370 */
-EXTERN int		Tcl_UtfNcasecmp (CONST char * s1, CONST char * s2, 
+EXTERN int		Tcl_UtfNcasecmp (const char * s1, const char * s2,
 				unsigned long n);
 #endif
 #ifndef Tcl_StringCaseMatch_TCL_DECLARED
 #define Tcl_StringCaseMatch_TCL_DECLARED
 /* 371 */
-EXTERN int		Tcl_StringCaseMatch (CONST char * str, 
-				CONST char * pattern, int nocase);
+EXTERN int		Tcl_StringCaseMatch (const char * str,
+				const char * pattern, int nocase);
 #endif
 #ifndef Tcl_UniCharIsControl_TCL_DECLARED
 #define Tcl_UniCharIsControl_TCL_DECLARED
@@ -2301,27 +2301,27 @@ EXTERN int		Tcl_UniCharIsPunct (int ch);
 #ifndef Tcl_RegExpExecObj_TCL_DECLARED
 #define Tcl_RegExpExecObj_TCL_DECLARED
 /* 376 */
-EXTERN int		Tcl_RegExpExecObj (Tcl_Interp * interp, 
-				Tcl_RegExp regexp, Tcl_Obj * textObj, 
+EXTERN int		Tcl_RegExpExecObj (Tcl_Interp * interp,
+				Tcl_RegExp regexp, Tcl_Obj * textObj,
 				int offset, int nmatches, int flags);
 #endif
 #ifndef Tcl_RegExpGetInfo_TCL_DECLARED
 #define Tcl_RegExpGetInfo_TCL_DECLARED
 /* 377 */
-EXTERN void		Tcl_RegExpGetInfo (Tcl_RegExp regexp, 
+EXTERN void		Tcl_RegExpGetInfo (Tcl_RegExp regexp,
 				Tcl_RegExpInfo * infoPtr);
 #endif
 #ifndef Tcl_NewUnicodeObj_TCL_DECLARED
 #define Tcl_NewUnicodeObj_TCL_DECLARED
 /* 378 */
-EXTERN Tcl_Obj *	Tcl_NewUnicodeObj (CONST Tcl_UniChar * unicode, 
+EXTERN Tcl_Obj *	Tcl_NewUnicodeObj (const Tcl_UniChar * unicode,
 				int numChars);
 #endif
 #ifndef Tcl_SetUnicodeObj_TCL_DECLARED
 #define Tcl_SetUnicodeObj_TCL_DECLARED
 /* 379 */
-EXTERN void		Tcl_SetUnicodeObj (Tcl_Obj * objPtr, 
-				CONST Tcl_UniChar * unicode, int numChars);
+EXTERN void		Tcl_SetUnicodeObj (Tcl_Obj * objPtr,
+				const Tcl_UniChar * unicode, int numChars);
 #endif
 #ifndef Tcl_GetCharLength_TCL_DECLARED
 #define Tcl_GetCharLength_TCL_DECLARED
@@ -2346,13 +2346,13 @@ EXTERN Tcl_Obj *	Tcl_GetRange (Tcl_Obj * objPtr, int first, int last);
 #ifndef Tcl_AppendUnicodeToObj_TCL_DECLARED
 #define Tcl_AppendUnicodeToObj_TCL_DECLARED
 /* 384 */
-EXTERN void		Tcl_AppendUnicodeToObj (Tcl_Obj * objPtr, 
-				CONST Tcl_UniChar * unicode, int length);
+EXTERN void		Tcl_AppendUnicodeToObj (Tcl_Obj * objPtr,
+				const Tcl_UniChar * unicode, int length);
 #endif
 #ifndef Tcl_RegExpMatchObj_TCL_DECLARED
 #define Tcl_RegExpMatchObj_TCL_DECLARED
 /* 385 */
-EXTERN int		Tcl_RegExpMatchObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_RegExpMatchObj (Tcl_Interp * interp,
 				Tcl_Obj * textObj, Tcl_Obj * patternObj);
 #endif
 #ifndef Tcl_SetNotifier_TCL_DECLARED
@@ -2373,15 +2373,15 @@ EXTERN int		Tcl_GetChannelNames (Tcl_Interp * interp);
 #ifndef Tcl_GetChannelNamesEx_TCL_DECLARED
 #define Tcl_GetChannelNamesEx_TCL_DECLARED
 /* 389 */
-EXTERN int		Tcl_GetChannelNamesEx (Tcl_Interp * interp, 
-				CONST char * pattern);
+EXTERN int		Tcl_GetChannelNamesEx (Tcl_Interp * interp,
+				const char * pattern);
 #endif
 #ifndef Tcl_ProcObjCmd_TCL_DECLARED
 #define Tcl_ProcObjCmd_TCL_DECLARED
 /* 390 */
-EXTERN int		Tcl_ProcObjCmd (ClientData clientData, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[]);
+EXTERN int		Tcl_ProcObjCmd (ClientData clientData,
+				Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_ConditionFinalize_TCL_DECLARED
 #define Tcl_ConditionFinalize_TCL_DECLARED
@@ -2396,21 +2396,21 @@ EXTERN void		Tcl_MutexFinalize (Tcl_Mutex * mutex);
 #ifndef Tcl_CreateThread_TCL_DECLARED
 #define Tcl_CreateThread_TCL_DECLARED
 /* 393 */
-EXTERN int		Tcl_CreateThread (Tcl_ThreadId * idPtr, 
-				Tcl_ThreadCreateProc proc, 
-				ClientData clientData, int stackSize, 
+EXTERN int		Tcl_CreateThread (Tcl_ThreadId * idPtr,
+				Tcl_ThreadCreateProc proc,
+				ClientData clientData, int stackSize,
 				int flags);
 #endif
 #ifndef Tcl_ReadRaw_TCL_DECLARED
 #define Tcl_ReadRaw_TCL_DECLARED
 /* 394 */
-EXTERN int		Tcl_ReadRaw (Tcl_Channel chan, char * dst, 
+EXTERN int		Tcl_ReadRaw (Tcl_Channel chan, char * dst,
 				int bytesToRead);
 #endif
 #ifndef Tcl_WriteRaw_TCL_DECLARED
 #define Tcl_WriteRaw_TCL_DECLARED
 /* 395 */
-EXTERN int		Tcl_WriteRaw (Tcl_Channel chan, CONST char * src, 
+EXTERN int		Tcl_WriteRaw (Tcl_Channel chan, const char * src,
 				int srcLen);
 #endif
 #ifndef Tcl_GetTopChannel_TCL_DECLARED
@@ -2427,85 +2427,85 @@ EXTERN int		Tcl_ChannelBuffered (Tcl_Channel chan);
 #define Tcl_ChannelName_TCL_DECLARED
 /* 398 */
 EXTERN CONST84_RETURN char * Tcl_ChannelName (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelVersion_TCL_DECLARED
 #define Tcl_ChannelVersion_TCL_DECLARED
 /* 399 */
 EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelBlockModeProc_TCL_DECLARED
 #define Tcl_ChannelBlockModeProc_TCL_DECLARED
 /* 400 */
 EXTERN Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelCloseProc_TCL_DECLARED
 #define Tcl_ChannelCloseProc_TCL_DECLARED
 /* 401 */
 EXTERN Tcl_DriverCloseProc * Tcl_ChannelCloseProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelClose2Proc_TCL_DECLARED
 #define Tcl_ChannelClose2Proc_TCL_DECLARED
 /* 402 */
 EXTERN Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelInputProc_TCL_DECLARED
 #define Tcl_ChannelInputProc_TCL_DECLARED
 /* 403 */
 EXTERN Tcl_DriverInputProc * Tcl_ChannelInputProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelOutputProc_TCL_DECLARED
 #define Tcl_ChannelOutputProc_TCL_DECLARED
 /* 404 */
 EXTERN Tcl_DriverOutputProc * Tcl_ChannelOutputProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelSeekProc_TCL_DECLARED
 #define Tcl_ChannelSeekProc_TCL_DECLARED
 /* 405 */
 EXTERN Tcl_DriverSeekProc * Tcl_ChannelSeekProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelSetOptionProc_TCL_DECLARED
 #define Tcl_ChannelSetOptionProc_TCL_DECLARED
 /* 406 */
 EXTERN Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelGetOptionProc_TCL_DECLARED
 #define Tcl_ChannelGetOptionProc_TCL_DECLARED
 /* 407 */
 EXTERN Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelWatchProc_TCL_DECLARED
 #define Tcl_ChannelWatchProc_TCL_DECLARED
 /* 408 */
 EXTERN Tcl_DriverWatchProc * Tcl_ChannelWatchProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelGetHandleProc_TCL_DECLARED
 #define Tcl_ChannelGetHandleProc_TCL_DECLARED
 /* 409 */
 EXTERN Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelFlushProc_TCL_DECLARED
 #define Tcl_ChannelFlushProc_TCL_DECLARED
 /* 410 */
 EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_ChannelHandlerProc_TCL_DECLARED
 #define Tcl_ChannelHandlerProc_TCL_DECLARED
 /* 411 */
 EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_JoinThread_TCL_DECLARED
 #define Tcl_JoinThread_TCL_DECLARED
@@ -2520,7 +2520,7 @@ EXTERN int		Tcl_IsChannelShared (Tcl_Channel channel);
 #ifndef Tcl_IsChannelRegistered_TCL_DECLARED
 #define Tcl_IsChannelRegistered_TCL_DECLARED
 /* 414 */
-EXTERN int		Tcl_IsChannelRegistered (Tcl_Interp* interp, 
+EXTERN int		Tcl_IsChannelRegistered (Tcl_Interp* interp,
 				Tcl_Channel channel);
 #endif
 #ifndef Tcl_CutChannel_TCL_DECLARED
@@ -2541,38 +2541,38 @@ EXTERN void		Tcl_ClearChannelHandlers (Tcl_Channel channel);
 #ifndef Tcl_IsChannelExisting_TCL_DECLARED
 #define Tcl_IsChannelExisting_TCL_DECLARED
 /* 418 */
-EXTERN int		Tcl_IsChannelExisting (CONST char* channelName);
+EXTERN int		Tcl_IsChannelExisting (const char* channelName);
 #endif
 #ifndef Tcl_UniCharNcasecmp_TCL_DECLARED
 #define Tcl_UniCharNcasecmp_TCL_DECLARED
 /* 419 */
-EXTERN int		Tcl_UniCharNcasecmp (CONST Tcl_UniChar * ucs, 
-				CONST Tcl_UniChar * uct, 
+EXTERN int		Tcl_UniCharNcasecmp (const Tcl_UniChar * ucs,
+				const Tcl_UniChar * uct,
 				unsigned long numChars);
 #endif
 #ifndef Tcl_UniCharCaseMatch_TCL_DECLARED
 #define Tcl_UniCharCaseMatch_TCL_DECLARED
 /* 420 */
-EXTERN int		Tcl_UniCharCaseMatch (CONST Tcl_UniChar * uniStr, 
-				CONST Tcl_UniChar * uniPattern, int nocase);
+EXTERN int		Tcl_UniCharCaseMatch (const Tcl_UniChar * uniStr,
+				const Tcl_UniChar * uniPattern, int nocase);
 #endif
 #ifndef Tcl_FindHashEntry_TCL_DECLARED
 #define Tcl_FindHashEntry_TCL_DECLARED
 /* 421 */
-EXTERN Tcl_HashEntry *	Tcl_FindHashEntry (Tcl_HashTable * tablePtr, 
-				CONST char * key);
+EXTERN Tcl_HashEntry *	Tcl_FindHashEntry (Tcl_HashTable * tablePtr,
+				const char * key);
 #endif
 #ifndef Tcl_CreateHashEntry_TCL_DECLARED
 #define Tcl_CreateHashEntry_TCL_DECLARED
 /* 422 */
-EXTERN Tcl_HashEntry *	Tcl_CreateHashEntry (Tcl_HashTable * tablePtr, 
-				CONST char * key, int * newPtr);
+EXTERN Tcl_HashEntry *	Tcl_CreateHashEntry (Tcl_HashTable * tablePtr,
+				const char * key, int * newPtr);
 #endif
 #ifndef Tcl_InitCustomHashTable_TCL_DECLARED
 #define Tcl_InitCustomHashTable_TCL_DECLARED
 /* 423 */
-EXTERN void		Tcl_InitCustomHashTable (Tcl_HashTable * tablePtr, 
-				int keyType, CONST Tcl_HashKeyType * typePtr);
+EXTERN void		Tcl_InitCustomHashTable (Tcl_HashTable * tablePtr,
+				int keyType, const Tcl_HashKeyType * typePtr);
 #endif
 #ifndef Tcl_InitObjHashTable_TCL_DECLARED
 #define Tcl_InitObjHashTable_TCL_DECLARED
@@ -2582,25 +2582,25 @@ EXTERN void		Tcl_InitObjHashTable (Tcl_HashTable * tablePtr);
 #ifndef Tcl_CommandTraceInfo_TCL_DECLARED
 #define Tcl_CommandTraceInfo_TCL_DECLARED
 /* 425 */
-EXTERN ClientData	Tcl_CommandTraceInfo (Tcl_Interp * interp, 
-				CONST char * varName, int flags, 
-				Tcl_CommandTraceProc * procPtr, 
+EXTERN ClientData	Tcl_CommandTraceInfo (Tcl_Interp * interp,
+				const char * varName, int flags,
+				Tcl_CommandTraceProc * procPtr,
 				ClientData prevClientData);
 #endif
 #ifndef Tcl_TraceCommand_TCL_DECLARED
 #define Tcl_TraceCommand_TCL_DECLARED
 /* 426 */
-EXTERN int		Tcl_TraceCommand (Tcl_Interp * interp, 
-				CONST char * varName, int flags, 
-				Tcl_CommandTraceProc * proc, 
+EXTERN int		Tcl_TraceCommand (Tcl_Interp * interp,
+				const char * varName, int flags,
+				Tcl_CommandTraceProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_UntraceCommand_TCL_DECLARED
 #define Tcl_UntraceCommand_TCL_DECLARED
 /* 427 */
-EXTERN void		Tcl_UntraceCommand (Tcl_Interp * interp, 
-				CONST char * varName, int flags, 
-				Tcl_CommandTraceProc * proc, 
+EXTERN void		Tcl_UntraceCommand (Tcl_Interp * interp,
+				const char * varName, int flags,
+				Tcl_CommandTraceProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_AttemptAlloc_TCL_DECLARED
@@ -2611,8 +2611,8 @@ EXTERN char *		Tcl_AttemptAlloc (unsigned int size);
 #ifndef Tcl_AttemptDbCkalloc_TCL_DECLARED
 #define Tcl_AttemptDbCkalloc_TCL_DECLARED
 /* 429 */
-EXTERN char *		Tcl_AttemptDbCkalloc (unsigned int size, 
-				CONST char * file, int line);
+EXTERN char *		Tcl_AttemptDbCkalloc (unsigned int size,
+				const char * file, int line);
 #endif
 #ifndef Tcl_AttemptRealloc_TCL_DECLARED
 #define Tcl_AttemptRealloc_TCL_DECLARED
@@ -2622,14 +2622,14 @@ EXTERN char *		Tcl_AttemptRealloc (char * ptr, unsigned int size);
 #ifndef Tcl_AttemptDbCkrealloc_TCL_DECLARED
 #define Tcl_AttemptDbCkrealloc_TCL_DECLARED
 /* 431 */
-EXTERN char *		Tcl_AttemptDbCkrealloc (char * ptr, 
-				unsigned int size, CONST char * file, 
+EXTERN char *		Tcl_AttemptDbCkrealloc (char * ptr,
+				unsigned int size, const char * file,
 				int line);
 #endif
 #ifndef Tcl_AttemptSetObjLength_TCL_DECLARED
 #define Tcl_AttemptSetObjLength_TCL_DECLARED
 /* 432 */
-EXTERN int		Tcl_AttemptSetObjLength (Tcl_Obj * objPtr, 
+EXTERN int		Tcl_AttemptSetObjLength (Tcl_Obj * objPtr,
 				int length);
 #endif
 #ifndef Tcl_GetChannelThread_TCL_DECLARED
@@ -2640,34 +2640,34 @@ EXTERN Tcl_ThreadId	Tcl_GetChannelThread (Tcl_Channel channel);
 #ifndef Tcl_GetUnicodeFromObj_TCL_DECLARED
 #define Tcl_GetUnicodeFromObj_TCL_DECLARED
 /* 434 */
-EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj (Tcl_Obj * objPtr, 
+EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj (Tcl_Obj * objPtr,
 				int * lengthPtr);
 #endif
 #ifndef Tcl_GetMathFuncInfo_TCL_DECLARED
 #define Tcl_GetMathFuncInfo_TCL_DECLARED
 /* 435 */
-EXTERN int		Tcl_GetMathFuncInfo (Tcl_Interp * interp, 
-				CONST char * name, int * numArgsPtr, 
-				Tcl_ValueType ** argTypesPtr, 
-				Tcl_MathProc ** procPtr, 
+EXTERN int		Tcl_GetMathFuncInfo (Tcl_Interp * interp,
+				const char * name, int * numArgsPtr,
+				Tcl_ValueType ** argTypesPtr,
+				Tcl_MathProc ** procPtr,
 				ClientData * clientDataPtr);
 #endif
 #ifndef Tcl_ListMathFuncs_TCL_DECLARED
 #define Tcl_ListMathFuncs_TCL_DECLARED
 /* 436 */
-EXTERN Tcl_Obj *	Tcl_ListMathFuncs (Tcl_Interp * interp, 
-				CONST char * pattern);
+EXTERN Tcl_Obj *	Tcl_ListMathFuncs (Tcl_Interp * interp,
+				const char * pattern);
 #endif
 #ifndef Tcl_SubstObj_TCL_DECLARED
 #define Tcl_SubstObj_TCL_DECLARED
 /* 437 */
-EXTERN Tcl_Obj *	Tcl_SubstObj (Tcl_Interp * interp, Tcl_Obj * objPtr, 
+EXTERN Tcl_Obj *	Tcl_SubstObj (Tcl_Interp * interp, Tcl_Obj * objPtr,
 				int flags);
 #endif
 #ifndef Tcl_DetachChannel_TCL_DECLARED
 #define Tcl_DetachChannel_TCL_DECLARED
 /* 438 */
-EXTERN int		Tcl_DetachChannel (Tcl_Interp* interp, 
+EXTERN int		Tcl_DetachChannel (Tcl_Interp* interp,
 				Tcl_Channel channel);
 #endif
 #ifndef Tcl_IsStandardChannel_TCL_DECLARED
@@ -2678,13 +2678,13 @@ EXTERN int		Tcl_IsStandardChannel (Tcl_Channel channel);
 #ifndef Tcl_FSCopyFile_TCL_DECLARED
 #define Tcl_FSCopyFile_TCL_DECLARED
 /* 440 */
-EXTERN int		Tcl_FSCopyFile (Tcl_Obj * srcPathPtr, 
+EXTERN int		Tcl_FSCopyFile (Tcl_Obj * srcPathPtr,
 				Tcl_Obj * destPathPtr);
 #endif
 #ifndef Tcl_FSCopyDirectory_TCL_DECLARED
 #define Tcl_FSCopyDirectory_TCL_DECLARED
 /* 441 */
-EXTERN int		Tcl_FSCopyDirectory (Tcl_Obj * srcPathPtr, 
+EXTERN int		Tcl_FSCopyDirectory (Tcl_Obj * srcPathPtr,
 				Tcl_Obj * destPathPtr, Tcl_Obj ** errorPtr);
 #endif
 #ifndef Tcl_FSCreateDirectory_TCL_DECLARED
@@ -2700,38 +2700,38 @@ EXTERN int		Tcl_FSDeleteFile (Tcl_Obj * pathPtr);
 #ifndef Tcl_FSLoadFile_TCL_DECLARED
 #define Tcl_FSLoadFile_TCL_DECLARED
 /* 444 */
-EXTERN int		Tcl_FSLoadFile (Tcl_Interp * interp, 
-				Tcl_Obj * pathPtr, CONST char * sym1, 
-				CONST char * sym2, 
-				Tcl_PackageInitProc ** proc1Ptr, 
-				Tcl_PackageInitProc ** proc2Ptr, 
-				Tcl_LoadHandle * handlePtr, 
+EXTERN int		Tcl_FSLoadFile (Tcl_Interp * interp,
+				Tcl_Obj * pathPtr, const char * sym1,
+				const char * sym2,
+				Tcl_PackageInitProc ** proc1Ptr,
+				Tcl_PackageInitProc ** proc2Ptr,
+				Tcl_LoadHandle * handlePtr,
 				Tcl_FSUnloadFileProc ** unloadProcPtr);
 #endif
 #ifndef Tcl_FSMatchInDirectory_TCL_DECLARED
 #define Tcl_FSMatchInDirectory_TCL_DECLARED
 /* 445 */
-EXTERN int		Tcl_FSMatchInDirectory (Tcl_Interp * interp, 
-				Tcl_Obj * result, Tcl_Obj * pathPtr, 
-				CONST char * pattern, 
+EXTERN int		Tcl_FSMatchInDirectory (Tcl_Interp * interp,
+				Tcl_Obj * result, Tcl_Obj * pathPtr,
+				const char * pattern,
 				Tcl_GlobTypeData * types);
 #endif
 #ifndef Tcl_FSLink_TCL_DECLARED
 #define Tcl_FSLink_TCL_DECLARED
 /* 446 */
-EXTERN Tcl_Obj *	Tcl_FSLink (Tcl_Obj * pathPtr, Tcl_Obj * toPtr, 
+EXTERN Tcl_Obj *	Tcl_FSLink (Tcl_Obj * pathPtr, Tcl_Obj * toPtr,
 				int linkAction);
 #endif
 #ifndef Tcl_FSRemoveDirectory_TCL_DECLARED
 #define Tcl_FSRemoveDirectory_TCL_DECLARED
 /* 447 */
-EXTERN int		Tcl_FSRemoveDirectory (Tcl_Obj * pathPtr, 
+EXTERN int		Tcl_FSRemoveDirectory (Tcl_Obj * pathPtr,
 				int recursive, Tcl_Obj ** errorPtr);
 #endif
 #ifndef Tcl_FSRenameFile_TCL_DECLARED
 #define Tcl_FSRenameFile_TCL_DECLARED
 /* 448 */
-EXTERN int		Tcl_FSRenameFile (Tcl_Obj * srcPathPtr, 
+EXTERN int		Tcl_FSRenameFile (Tcl_Obj * srcPathPtr,
 				Tcl_Obj * destPathPtr);
 #endif
 #ifndef Tcl_FSLstat_TCL_DECLARED
@@ -2742,25 +2742,25 @@ EXTERN int		Tcl_FSLstat (Tcl_Obj * pathPtr, Tcl_StatBuf * buf);
 #ifndef Tcl_FSUtime_TCL_DECLARED
 #define Tcl_FSUtime_TCL_DECLARED
 /* 450 */
-EXTERN int		Tcl_FSUtime (Tcl_Obj * pathPtr, 
+EXTERN int		Tcl_FSUtime (Tcl_Obj * pathPtr,
 				struct utimbuf * tval);
 #endif
 #ifndef Tcl_FSFileAttrsGet_TCL_DECLARED
 #define Tcl_FSFileAttrsGet_TCL_DECLARED
 /* 451 */
-EXTERN int		Tcl_FSFileAttrsGet (Tcl_Interp * interp, int index, 
+EXTERN int		Tcl_FSFileAttrsGet (Tcl_Interp * interp, int index,
 				Tcl_Obj * pathPtr, Tcl_Obj ** objPtrRef);
 #endif
 #ifndef Tcl_FSFileAttrsSet_TCL_DECLARED
 #define Tcl_FSFileAttrsSet_TCL_DECLARED
 /* 452 */
-EXTERN int		Tcl_FSFileAttrsSet (Tcl_Interp * interp, int index, 
+EXTERN int		Tcl_FSFileAttrsSet (Tcl_Interp * interp, int index,
 				Tcl_Obj * pathPtr, Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_FSFileAttrStrings_TCL_DECLARED
 #define Tcl_FSFileAttrStrings_TCL_DECLARED
 /* 453 */
-EXTERN CONST char *CONST86 * Tcl_FSFileAttrStrings (Tcl_Obj * pathPtr, 
+EXTERN const char *CONST86 * Tcl_FSFileAttrStrings (Tcl_Obj * pathPtr,
 				Tcl_Obj ** objPtrRef);
 #endif
 #ifndef Tcl_FSStat_TCL_DECLARED
@@ -2776,8 +2776,8 @@ EXTERN int		Tcl_FSAccess (Tcl_Obj * pathPtr, int mode);
 #ifndef Tcl_FSOpenFileChannel_TCL_DECLARED
 #define Tcl_FSOpenFileChannel_TCL_DECLARED
 /* 456 */
-EXTERN Tcl_Channel	Tcl_FSOpenFileChannel (Tcl_Interp * interp, 
-				Tcl_Obj * pathPtr, CONST char * modeString, 
+EXTERN Tcl_Channel	Tcl_FSOpenFileChannel (Tcl_Interp * interp,
+				Tcl_Obj * pathPtr, const char * modeString,
 				int permissions);
 #endif
 #ifndef Tcl_FSGetCwd_TCL_DECLARED
@@ -2793,7 +2793,7 @@ EXTERN int		Tcl_FSChdir (Tcl_Obj * pathPtr);
 #ifndef Tcl_FSConvertToPathType_TCL_DECLARED
 #define Tcl_FSConvertToPathType_TCL_DECLARED
 /* 459 */
-EXTERN int		Tcl_FSConvertToPathType (Tcl_Interp * interp, 
+EXTERN int		Tcl_FSConvertToPathType (Tcl_Interp * interp,
 				Tcl_Obj * pathPtr);
 #endif
 #ifndef Tcl_FSJoinPath_TCL_DECLARED
@@ -2809,50 +2809,50 @@ EXTERN Tcl_Obj*		Tcl_FSSplitPath (Tcl_Obj* pathPtr, int * lenPtr);
 #ifndef Tcl_FSEqualPaths_TCL_DECLARED
 #define Tcl_FSEqualPaths_TCL_DECLARED
 /* 462 */
-EXTERN int		Tcl_FSEqualPaths (Tcl_Obj* firstPtr, 
+EXTERN int		Tcl_FSEqualPaths (Tcl_Obj* firstPtr,
 				Tcl_Obj* secondPtr);
 #endif
 #ifndef Tcl_FSGetNormalizedPath_TCL_DECLARED
 #define Tcl_FSGetNormalizedPath_TCL_DECLARED
 /* 463 */
-EXTERN Tcl_Obj*		Tcl_FSGetNormalizedPath (Tcl_Interp * interp, 
+EXTERN Tcl_Obj*		Tcl_FSGetNormalizedPath (Tcl_Interp * interp,
 				Tcl_Obj* pathPtr);
 #endif
 #ifndef Tcl_FSJoinToPath_TCL_DECLARED
 #define Tcl_FSJoinToPath_TCL_DECLARED
 /* 464 */
-EXTERN Tcl_Obj*		Tcl_FSJoinToPath (Tcl_Obj * pathPtr, int objc, 
-				Tcl_Obj *CONST objv[]);
+EXTERN Tcl_Obj*		Tcl_FSJoinToPath (Tcl_Obj * pathPtr, int objc,
+				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_FSGetInternalRep_TCL_DECLARED
 #define Tcl_FSGetInternalRep_TCL_DECLARED
 /* 465 */
-EXTERN ClientData	Tcl_FSGetInternalRep (Tcl_Obj* pathPtr, 
-				CONST Tcl_Filesystem * fsPtr);
+EXTERN ClientData	Tcl_FSGetInternalRep (Tcl_Obj* pathPtr,
+				const Tcl_Filesystem * fsPtr);
 #endif
 #ifndef Tcl_FSGetTranslatedPath_TCL_DECLARED
 #define Tcl_FSGetTranslatedPath_TCL_DECLARED
 /* 466 */
-EXTERN Tcl_Obj*		Tcl_FSGetTranslatedPath (Tcl_Interp * interp, 
+EXTERN Tcl_Obj*		Tcl_FSGetTranslatedPath (Tcl_Interp * interp,
 				Tcl_Obj* pathPtr);
 #endif
 #ifndef Tcl_FSEvalFile_TCL_DECLARED
 #define Tcl_FSEvalFile_TCL_DECLARED
 /* 467 */
-EXTERN int		Tcl_FSEvalFile (Tcl_Interp * interp, 
+EXTERN int		Tcl_FSEvalFile (Tcl_Interp * interp,
 				Tcl_Obj * fileName);
 #endif
 #ifndef Tcl_FSNewNativePath_TCL_DECLARED
 #define Tcl_FSNewNativePath_TCL_DECLARED
 /* 468 */
 EXTERN Tcl_Obj*		Tcl_FSNewNativePath (
-				CONST Tcl_Filesystem* fromFilesystem, 
+				const Tcl_Filesystem* fromFilesystem,
 				ClientData clientData);
 #endif
 #ifndef Tcl_FSGetNativePath_TCL_DECLARED
 #define Tcl_FSGetNativePath_TCL_DECLARED
 /* 469 */
-EXTERN CONST char*	Tcl_FSGetNativePath (Tcl_Obj* pathPtr);
+EXTERN const char*	Tcl_FSGetNativePath (Tcl_Obj* pathPtr);
 #endif
 #ifndef Tcl_FSFileSystemInfo_TCL_DECLARED
 #define Tcl_FSFileSystemInfo_TCL_DECLARED
@@ -2872,23 +2872,23 @@ EXTERN Tcl_Obj*		Tcl_FSListVolumes (void);
 #ifndef Tcl_FSRegister_TCL_DECLARED
 #define Tcl_FSRegister_TCL_DECLARED
 /* 473 */
-EXTERN int		Tcl_FSRegister (ClientData clientData, 
-				CONST Tcl_Filesystem * fsPtr);
+EXTERN int		Tcl_FSRegister (ClientData clientData,
+				const Tcl_Filesystem * fsPtr);
 #endif
 #ifndef Tcl_FSUnregister_TCL_DECLARED
 #define Tcl_FSUnregister_TCL_DECLARED
 /* 474 */
-EXTERN int		Tcl_FSUnregister (CONST Tcl_Filesystem * fsPtr);
+EXTERN int		Tcl_FSUnregister (const Tcl_Filesystem * fsPtr);
 #endif
 #ifndef Tcl_FSData_TCL_DECLARED
 #define Tcl_FSData_TCL_DECLARED
 /* 475 */
-EXTERN ClientData	Tcl_FSData (CONST Tcl_Filesystem * fsPtr);
+EXTERN ClientData	Tcl_FSData (const Tcl_Filesystem * fsPtr);
 #endif
 #ifndef Tcl_FSGetTranslatedStringPath_TCL_DECLARED
 #define Tcl_FSGetTranslatedStringPath_TCL_DECLARED
 /* 476 */
-EXTERN CONST char*	Tcl_FSGetTranslatedStringPath (Tcl_Interp * interp, 
+EXTERN const char*	Tcl_FSGetTranslatedStringPath (Tcl_Interp * interp,
 				Tcl_Obj* pathPtr);
 #endif
 #ifndef Tcl_FSGetFileSystemForPath_TCL_DECLARED
@@ -2909,12 +2909,12 @@ EXTERN int		Tcl_OutputBuffered (Tcl_Channel chan);
 #ifndef Tcl_FSMountsChanged_TCL_DECLARED
 #define Tcl_FSMountsChanged_TCL_DECLARED
 /* 480 */
-EXTERN void		Tcl_FSMountsChanged (CONST Tcl_Filesystem * fsPtr);
+EXTERN void		Tcl_FSMountsChanged (const Tcl_Filesystem * fsPtr);
 #endif
 #ifndef Tcl_EvalTokensStandard_TCL_DECLARED
 #define Tcl_EvalTokensStandard_TCL_DECLARED
 /* 481 */
-EXTERN int		Tcl_EvalTokensStandard (Tcl_Interp * interp, 
+EXTERN int		Tcl_EvalTokensStandard (Tcl_Interp * interp,
 				Tcl_Token * tokenPtr, int count);
 #endif
 #ifndef Tcl_GetTime_TCL_DECLARED
@@ -2925,33 +2925,33 @@ EXTERN void		Tcl_GetTime (Tcl_Time* timeBuf);
 #ifndef Tcl_CreateObjTrace_TCL_DECLARED
 #define Tcl_CreateObjTrace_TCL_DECLARED
 /* 483 */
-EXTERN Tcl_Trace	Tcl_CreateObjTrace (Tcl_Interp* interp, int level, 
-				int flags, Tcl_CmdObjTraceProc* objProc, 
-				ClientData clientData, 
+EXTERN Tcl_Trace	Tcl_CreateObjTrace (Tcl_Interp* interp, int level,
+				int flags, Tcl_CmdObjTraceProc* objProc,
+				ClientData clientData,
 				Tcl_CmdObjTraceDeleteProc* delProc);
 #endif
 #ifndef Tcl_GetCommandInfoFromToken_TCL_DECLARED
 #define Tcl_GetCommandInfoFromToken_TCL_DECLARED
 /* 484 */
-EXTERN int		Tcl_GetCommandInfoFromToken (Tcl_Command token, 
+EXTERN int		Tcl_GetCommandInfoFromToken (Tcl_Command token,
 				Tcl_CmdInfo* infoPtr);
 #endif
 #ifndef Tcl_SetCommandInfoFromToken_TCL_DECLARED
 #define Tcl_SetCommandInfoFromToken_TCL_DECLARED
 /* 485 */
-EXTERN int		Tcl_SetCommandInfoFromToken (Tcl_Command token, 
-				CONST Tcl_CmdInfo* infoPtr);
+EXTERN int		Tcl_SetCommandInfoFromToken (Tcl_Command token,
+				const Tcl_CmdInfo* infoPtr);
 #endif
 #ifndef Tcl_DbNewWideIntObj_TCL_DECLARED
 #define Tcl_DbNewWideIntObj_TCL_DECLARED
 /* 486 */
-EXTERN Tcl_Obj *	Tcl_DbNewWideIntObj (Tcl_WideInt wideValue, 
-				CONST char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewWideIntObj (Tcl_WideInt wideValue,
+				const char * file, int line);
 #endif
 #ifndef Tcl_GetWideIntFromObj_TCL_DECLARED
 #define Tcl_GetWideIntFromObj_TCL_DECLARED
 /* 487 */
-EXTERN int		Tcl_GetWideIntFromObj (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetWideIntFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, Tcl_WideInt * widePtr);
 #endif
 #ifndef Tcl_NewWideIntObj_TCL_DECLARED
@@ -2962,7 +2962,7 @@ EXTERN Tcl_Obj *	Tcl_NewWideIntObj (Tcl_WideInt wideValue);
 #ifndef Tcl_SetWideIntObj_TCL_DECLARED
 #define Tcl_SetWideIntObj_TCL_DECLARED
 /* 489 */
-EXTERN void		Tcl_SetWideIntObj (Tcl_Obj * objPtr, 
+EXTERN void		Tcl_SetWideIntObj (Tcl_Obj * objPtr,
 				Tcl_WideInt wideValue);
 #endif
 #ifndef Tcl_AllocStatBuf_TCL_DECLARED
@@ -2973,7 +2973,7 @@ EXTERN Tcl_StatBuf *	Tcl_AllocStatBuf (void);
 #ifndef Tcl_Seek_TCL_DECLARED
 #define Tcl_Seek_TCL_DECLARED
 /* 491 */
-EXTERN Tcl_WideInt	Tcl_Seek (Tcl_Channel chan, Tcl_WideInt offset, 
+EXTERN Tcl_WideInt	Tcl_Seek (Tcl_Channel chan, Tcl_WideInt offset,
 				int mode);
 #endif
 #ifndef Tcl_Tell_TCL_DECLARED
@@ -2985,48 +2985,48 @@ EXTERN Tcl_WideInt	Tcl_Tell (Tcl_Channel chan);
 #define Tcl_ChannelWideSeekProc_TCL_DECLARED
 /* 493 */
 EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_DictObjPut_TCL_DECLARED
 #define Tcl_DictObjPut_TCL_DECLARED
 /* 494 */
-EXTERN int		Tcl_DictObjPut (Tcl_Interp * interp, 
-				Tcl_Obj * dictPtr, Tcl_Obj * keyPtr, 
+EXTERN int		Tcl_DictObjPut (Tcl_Interp * interp,
+				Tcl_Obj * dictPtr, Tcl_Obj * keyPtr,
 				Tcl_Obj * valuePtr);
 #endif
 #ifndef Tcl_DictObjGet_TCL_DECLARED
 #define Tcl_DictObjGet_TCL_DECLARED
 /* 495 */
-EXTERN int		Tcl_DictObjGet (Tcl_Interp * interp, 
-				Tcl_Obj * dictPtr, Tcl_Obj * keyPtr, 
+EXTERN int		Tcl_DictObjGet (Tcl_Interp * interp,
+				Tcl_Obj * dictPtr, Tcl_Obj * keyPtr,
 				Tcl_Obj ** valuePtrPtr);
 #endif
 #ifndef Tcl_DictObjRemove_TCL_DECLARED
 #define Tcl_DictObjRemove_TCL_DECLARED
 /* 496 */
-EXTERN int		Tcl_DictObjRemove (Tcl_Interp * interp, 
+EXTERN int		Tcl_DictObjRemove (Tcl_Interp * interp,
 				Tcl_Obj * dictPtr, Tcl_Obj * keyPtr);
 #endif
 #ifndef Tcl_DictObjSize_TCL_DECLARED
 #define Tcl_DictObjSize_TCL_DECLARED
 /* 497 */
-EXTERN int		Tcl_DictObjSize (Tcl_Interp * interp, 
+EXTERN int		Tcl_DictObjSize (Tcl_Interp * interp,
 				Tcl_Obj * dictPtr, int * sizePtr);
 #endif
 #ifndef Tcl_DictObjFirst_TCL_DECLARED
 #define Tcl_DictObjFirst_TCL_DECLARED
 /* 498 */
-EXTERN int		Tcl_DictObjFirst (Tcl_Interp * interp, 
-				Tcl_Obj * dictPtr, 
-				Tcl_DictSearch * searchPtr, 
-				Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr, 
+EXTERN int		Tcl_DictObjFirst (Tcl_Interp * interp,
+				Tcl_Obj * dictPtr,
+				Tcl_DictSearch * searchPtr,
+				Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr,
 				int * donePtr);
 #endif
 #ifndef Tcl_DictObjNext_TCL_DECLARED
 #define Tcl_DictObjNext_TCL_DECLARED
 /* 499 */
-EXTERN void		Tcl_DictObjNext (Tcl_DictSearch * searchPtr, 
-				Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr, 
+EXTERN void		Tcl_DictObjNext (Tcl_DictSearch * searchPtr,
+				Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr,
 				int * donePtr);
 #endif
 #ifndef Tcl_DictObjDone_TCL_DECLARED
@@ -3037,16 +3037,16 @@ EXTERN void		Tcl_DictObjDone (Tcl_DictSearch * searchPtr);
 #ifndef Tcl_DictObjPutKeyList_TCL_DECLARED
 #define Tcl_DictObjPutKeyList_TCL_DECLARED
 /* 501 */
-EXTERN int		Tcl_DictObjPutKeyList (Tcl_Interp * interp, 
-				Tcl_Obj * dictPtr, int keyc, 
-				Tcl_Obj *CONST * keyv, Tcl_Obj * valuePtr);
+EXTERN int		Tcl_DictObjPutKeyList (Tcl_Interp * interp,
+				Tcl_Obj * dictPtr, int keyc,
+				Tcl_Obj *const * keyv, Tcl_Obj * valuePtr);
 #endif
 #ifndef Tcl_DictObjRemoveKeyList_TCL_DECLARED
 #define Tcl_DictObjRemoveKeyList_TCL_DECLARED
 /* 502 */
-EXTERN int		Tcl_DictObjRemoveKeyList (Tcl_Interp * interp, 
-				Tcl_Obj * dictPtr, int keyc, 
-				Tcl_Obj *CONST * keyv);
+EXTERN int		Tcl_DictObjRemoveKeyList (Tcl_Interp * interp,
+				Tcl_Obj * dictPtr, int keyc,
+				Tcl_Obj *const * keyv);
 #endif
 #ifndef Tcl_NewDictObj_TCL_DECLARED
 #define Tcl_NewDictObj_TCL_DECLARED
@@ -3056,21 +3056,21 @@ EXTERN Tcl_Obj *	Tcl_NewDictObj (void);
 #ifndef Tcl_DbNewDictObj_TCL_DECLARED
 #define Tcl_DbNewDictObj_TCL_DECLARED
 /* 504 */
-EXTERN Tcl_Obj *	Tcl_DbNewDictObj (CONST char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewDictObj (const char * file, int line);
 #endif
 #ifndef Tcl_RegisterConfig_TCL_DECLARED
 #define Tcl_RegisterConfig_TCL_DECLARED
 /* 505 */
-EXTERN void		Tcl_RegisterConfig (Tcl_Interp* interp, 
-				CONST char* pkgName, 
-				CONST Tcl_Config* configuration, 
-				CONST char* valEncoding);
+EXTERN void		Tcl_RegisterConfig (Tcl_Interp* interp,
+				const char* pkgName,
+				const Tcl_Config* configuration,
+				const char* valEncoding);
 #endif
 #ifndef Tcl_CreateNamespace_TCL_DECLARED
 #define Tcl_CreateNamespace_TCL_DECLARED
 /* 506 */
-EXTERN Tcl_Namespace *	Tcl_CreateNamespace (Tcl_Interp * interp, 
-				CONST char * name, ClientData clientData, 
+EXTERN Tcl_Namespace *	Tcl_CreateNamespace (Tcl_Interp * interp,
+				const char * name, ClientData clientData,
 				Tcl_NamespaceDeleteProc * deleteProc);
 #endif
 #ifndef Tcl_DeleteNamespace_TCL_DECLARED
@@ -3081,28 +3081,28 @@ EXTERN void		Tcl_DeleteNamespace (Tcl_Namespace * nsPtr);
 #ifndef Tcl_AppendExportList_TCL_DECLARED
 #define Tcl_AppendExportList_TCL_DECLARED
 /* 508 */
-EXTERN int		Tcl_AppendExportList (Tcl_Interp * interp, 
+EXTERN int		Tcl_AppendExportList (Tcl_Interp * interp,
 				Tcl_Namespace * nsPtr, Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_Export_TCL_DECLARED
 #define Tcl_Export_TCL_DECLARED
 /* 509 */
-EXTERN int		Tcl_Export (Tcl_Interp * interp, 
-				Tcl_Namespace * nsPtr, CONST char * pattern, 
+EXTERN int		Tcl_Export (Tcl_Interp * interp,
+				Tcl_Namespace * nsPtr, const char * pattern,
 				int resetListFirst);
 #endif
 #ifndef Tcl_Import_TCL_DECLARED
 #define Tcl_Import_TCL_DECLARED
 /* 510 */
-EXTERN int		Tcl_Import (Tcl_Interp * interp, 
-				Tcl_Namespace * nsPtr, CONST char * pattern, 
+EXTERN int		Tcl_Import (Tcl_Interp * interp,
+				Tcl_Namespace * nsPtr, const char * pattern,
 				int allowOverwrite);
 #endif
 #ifndef Tcl_ForgetImport_TCL_DECLARED
 #define Tcl_ForgetImport_TCL_DECLARED
 /* 511 */
-EXTERN int		Tcl_ForgetImport (Tcl_Interp * interp, 
-				Tcl_Namespace * nsPtr, CONST char * pattern);
+EXTERN int		Tcl_ForgetImport (Tcl_Interp * interp,
+				Tcl_Namespace * nsPtr, const char * pattern);
 #endif
 #ifndef Tcl_GetCurrentNamespace_TCL_DECLARED
 #define Tcl_GetCurrentNamespace_TCL_DECLARED
@@ -3117,35 +3117,35 @@ EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace (Tcl_Interp * interp);
 #ifndef Tcl_FindNamespace_TCL_DECLARED
 #define Tcl_FindNamespace_TCL_DECLARED
 /* 514 */
-EXTERN Tcl_Namespace *	Tcl_FindNamespace (Tcl_Interp * interp, 
-				CONST char * name, 
+EXTERN Tcl_Namespace *	Tcl_FindNamespace (Tcl_Interp * interp,
+				const char * name,
 				Tcl_Namespace * contextNsPtr, int flags);
 #endif
 #ifndef Tcl_FindCommand_TCL_DECLARED
 #define Tcl_FindCommand_TCL_DECLARED
 /* 515 */
-EXTERN Tcl_Command	Tcl_FindCommand (Tcl_Interp * interp, 
-				CONST char * name, 
+EXTERN Tcl_Command	Tcl_FindCommand (Tcl_Interp * interp,
+				const char * name,
 				Tcl_Namespace * contextNsPtr, int flags);
 #endif
 #ifndef Tcl_GetCommandFromObj_TCL_DECLARED
 #define Tcl_GetCommandFromObj_TCL_DECLARED
 /* 516 */
-EXTERN Tcl_Command	Tcl_GetCommandFromObj (Tcl_Interp * interp, 
+EXTERN Tcl_Command	Tcl_GetCommandFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_GetCommandFullName_TCL_DECLARED
 #define Tcl_GetCommandFullName_TCL_DECLARED
 /* 517 */
-EXTERN void		Tcl_GetCommandFullName (Tcl_Interp * interp, 
+EXTERN void		Tcl_GetCommandFullName (Tcl_Interp * interp,
 				Tcl_Command command, Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_FSEvalFileEx_TCL_DECLARED
 #define Tcl_FSEvalFileEx_TCL_DECLARED
 /* 518 */
-EXTERN int		Tcl_FSEvalFileEx (Tcl_Interp * interp, 
-				Tcl_Obj * fileName, 
-				CONST char * encodingName);
+EXTERN int		Tcl_FSEvalFileEx (Tcl_Interp * interp,
+				Tcl_Obj * fileName,
+				const char * encodingName);
 #endif
 #ifndef Tcl_SetExitProc_TCL_DECLARED
 #define Tcl_SetExitProc_TCL_DECLARED
@@ -3155,16 +3155,16 @@ EXTERN Tcl_ExitProc *	Tcl_SetExitProc (Tcl_ExitProc * proc);
 #ifndef Tcl_LimitAddHandler_TCL_DECLARED
 #define Tcl_LimitAddHandler_TCL_DECLARED
 /* 520 */
-EXTERN void		Tcl_LimitAddHandler (Tcl_Interp * interp, int type, 
-				Tcl_LimitHandlerProc * handlerProc, 
-				ClientData clientData, 
+EXTERN void		Tcl_LimitAddHandler (Tcl_Interp * interp, int type,
+				Tcl_LimitHandlerProc * handlerProc,
+				ClientData clientData,
 				Tcl_LimitHandlerDeleteProc * deleteProc);
 #endif
 #ifndef Tcl_LimitRemoveHandler_TCL_DECLARED
 #define Tcl_LimitRemoveHandler_TCL_DECLARED
 /* 521 */
-EXTERN void		Tcl_LimitRemoveHandler (Tcl_Interp * interp, 
-				int type, Tcl_LimitHandlerProc * handlerProc, 
+EXTERN void		Tcl_LimitRemoveHandler (Tcl_Interp * interp,
+				int type, Tcl_LimitHandlerProc * handlerProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_LimitReady_TCL_DECLARED
@@ -3185,19 +3185,19 @@ EXTERN int		Tcl_LimitExceeded (Tcl_Interp * interp);
 #ifndef Tcl_LimitSetCommands_TCL_DECLARED
 #define Tcl_LimitSetCommands_TCL_DECLARED
 /* 525 */
-EXTERN void		Tcl_LimitSetCommands (Tcl_Interp * interp, 
+EXTERN void		Tcl_LimitSetCommands (Tcl_Interp * interp,
 				int commandLimit);
 #endif
 #ifndef Tcl_LimitSetTime_TCL_DECLARED
 #define Tcl_LimitSetTime_TCL_DECLARED
 /* 526 */
-EXTERN void		Tcl_LimitSetTime (Tcl_Interp * interp, 
+EXTERN void		Tcl_LimitSetTime (Tcl_Interp * interp,
 				Tcl_Time * timeLimitPtr);
 #endif
 #ifndef Tcl_LimitSetGranularity_TCL_DECLARED
 #define Tcl_LimitSetGranularity_TCL_DECLARED
 /* 527 */
-EXTERN void		Tcl_LimitSetGranularity (Tcl_Interp * interp, 
+EXTERN void		Tcl_LimitSetGranularity (Tcl_Interp * interp,
 				int type, int granularity);
 #endif
 #ifndef Tcl_LimitTypeEnabled_TCL_DECLARED
@@ -3228,13 +3228,13 @@ EXTERN int		Tcl_LimitGetCommands (Tcl_Interp * interp);
 #ifndef Tcl_LimitGetTime_TCL_DECLARED
 #define Tcl_LimitGetTime_TCL_DECLARED
 /* 533 */
-EXTERN void		Tcl_LimitGetTime (Tcl_Interp * interp, 
+EXTERN void		Tcl_LimitGetTime (Tcl_Interp * interp,
 				Tcl_Time * timeLimitPtr);
 #endif
 #ifndef Tcl_LimitGetGranularity_TCL_DECLARED
 #define Tcl_LimitGetGranularity_TCL_DECLARED
 /* 534 */
-EXTERN int		Tcl_LimitGetGranularity (Tcl_Interp * interp, 
+EXTERN int		Tcl_LimitGetGranularity (Tcl_Interp * interp,
 				int type);
 #endif
 #ifndef Tcl_SaveInterpState_TCL_DECLARED
@@ -3245,7 +3245,7 @@ EXTERN Tcl_InterpState	Tcl_SaveInterpState (Tcl_Interp * interp, int status);
 #ifndef Tcl_RestoreInterpState_TCL_DECLARED
 #define Tcl_RestoreInterpState_TCL_DECLARED
 /* 536 */
-EXTERN int		Tcl_RestoreInterpState (Tcl_Interp * interp, 
+EXTERN int		Tcl_RestoreInterpState (Tcl_Interp * interp,
 				Tcl_InterpState state);
 #endif
 #ifndef Tcl_DiscardInterpState_TCL_DECLARED
@@ -3256,13 +3256,13 @@ EXTERN void		Tcl_DiscardInterpState (Tcl_InterpState state);
 #ifndef Tcl_SetReturnOptions_TCL_DECLARED
 #define Tcl_SetReturnOptions_TCL_DECLARED
 /* 538 */
-EXTERN int		Tcl_SetReturnOptions (Tcl_Interp * interp, 
+EXTERN int		Tcl_SetReturnOptions (Tcl_Interp * interp,
 				Tcl_Obj * options);
 #endif
 #ifndef Tcl_GetReturnOptions_TCL_DECLARED
 #define Tcl_GetReturnOptions_TCL_DECLARED
 /* 539 */
-EXTERN Tcl_Obj *	Tcl_GetReturnOptions (Tcl_Interp * interp, 
+EXTERN Tcl_Obj *	Tcl_GetReturnOptions (Tcl_Interp * interp,
 				int result);
 #endif
 #ifndef Tcl_IsEnsemble_TCL_DECLARED
@@ -3273,90 +3273,90 @@ EXTERN int		Tcl_IsEnsemble (Tcl_Command token);
 #ifndef Tcl_CreateEnsemble_TCL_DECLARED
 #define Tcl_CreateEnsemble_TCL_DECLARED
 /* 541 */
-EXTERN Tcl_Command	Tcl_CreateEnsemble (Tcl_Interp * interp, 
-				CONST char * name, 
+EXTERN Tcl_Command	Tcl_CreateEnsemble (Tcl_Interp * interp,
+				const char * name,
 				Tcl_Namespace * namespacePtr, int flags);
 #endif
 #ifndef Tcl_FindEnsemble_TCL_DECLARED
 #define Tcl_FindEnsemble_TCL_DECLARED
 /* 542 */
-EXTERN Tcl_Command	Tcl_FindEnsemble (Tcl_Interp * interp, 
+EXTERN Tcl_Command	Tcl_FindEnsemble (Tcl_Interp * interp,
 				Tcl_Obj * cmdNameObj, int flags);
 #endif
 #ifndef Tcl_SetEnsembleSubcommandList_TCL_DECLARED
 #define Tcl_SetEnsembleSubcommandList_TCL_DECLARED
 /* 543 */
-EXTERN int		Tcl_SetEnsembleSubcommandList (Tcl_Interp * interp, 
+EXTERN int		Tcl_SetEnsembleSubcommandList (Tcl_Interp * interp,
 				Tcl_Command token, Tcl_Obj * subcmdList);
 #endif
 #ifndef Tcl_SetEnsembleMappingDict_TCL_DECLARED
 #define Tcl_SetEnsembleMappingDict_TCL_DECLARED
 /* 544 */
-EXTERN int		Tcl_SetEnsembleMappingDict (Tcl_Interp * interp, 
+EXTERN int		Tcl_SetEnsembleMappingDict (Tcl_Interp * interp,
 				Tcl_Command token, Tcl_Obj * mapDict);
 #endif
 #ifndef Tcl_SetEnsembleUnknownHandler_TCL_DECLARED
 #define Tcl_SetEnsembleUnknownHandler_TCL_DECLARED
 /* 545 */
-EXTERN int		Tcl_SetEnsembleUnknownHandler (Tcl_Interp * interp, 
+EXTERN int		Tcl_SetEnsembleUnknownHandler (Tcl_Interp * interp,
 				Tcl_Command token, Tcl_Obj * unknownList);
 #endif
 #ifndef Tcl_SetEnsembleFlags_TCL_DECLARED
 #define Tcl_SetEnsembleFlags_TCL_DECLARED
 /* 546 */
-EXTERN int		Tcl_SetEnsembleFlags (Tcl_Interp * interp, 
+EXTERN int		Tcl_SetEnsembleFlags (Tcl_Interp * interp,
 				Tcl_Command token, int flags);
 #endif
 #ifndef Tcl_GetEnsembleSubcommandList_TCL_DECLARED
 #define Tcl_GetEnsembleSubcommandList_TCL_DECLARED
 /* 547 */
-EXTERN int		Tcl_GetEnsembleSubcommandList (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetEnsembleSubcommandList (Tcl_Interp * interp,
 				Tcl_Command token, Tcl_Obj ** subcmdListPtr);
 #endif
 #ifndef Tcl_GetEnsembleMappingDict_TCL_DECLARED
 #define Tcl_GetEnsembleMappingDict_TCL_DECLARED
 /* 548 */
-EXTERN int		Tcl_GetEnsembleMappingDict (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetEnsembleMappingDict (Tcl_Interp * interp,
 				Tcl_Command token, Tcl_Obj ** mapDictPtr);
 #endif
 #ifndef Tcl_GetEnsembleUnknownHandler_TCL_DECLARED
 #define Tcl_GetEnsembleUnknownHandler_TCL_DECLARED
 /* 549 */
-EXTERN int		Tcl_GetEnsembleUnknownHandler (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetEnsembleUnknownHandler (Tcl_Interp * interp,
 				Tcl_Command token, Tcl_Obj ** unknownListPtr);
 #endif
 #ifndef Tcl_GetEnsembleFlags_TCL_DECLARED
 #define Tcl_GetEnsembleFlags_TCL_DECLARED
 /* 550 */
-EXTERN int		Tcl_GetEnsembleFlags (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetEnsembleFlags (Tcl_Interp * interp,
 				Tcl_Command token, int * flagsPtr);
 #endif
 #ifndef Tcl_GetEnsembleNamespace_TCL_DECLARED
 #define Tcl_GetEnsembleNamespace_TCL_DECLARED
 /* 551 */
-EXTERN int		Tcl_GetEnsembleNamespace (Tcl_Interp * interp, 
-				Tcl_Command token, 
+EXTERN int		Tcl_GetEnsembleNamespace (Tcl_Interp * interp,
+				Tcl_Command token,
 				Tcl_Namespace ** namespacePtrPtr);
 #endif
 #ifndef Tcl_SetTimeProc_TCL_DECLARED
 #define Tcl_SetTimeProc_TCL_DECLARED
 /* 552 */
-EXTERN void		Tcl_SetTimeProc (Tcl_GetTimeProc* getProc, 
-				Tcl_ScaleTimeProc* scaleProc, 
+EXTERN void		Tcl_SetTimeProc (Tcl_GetTimeProc* getProc,
+				Tcl_ScaleTimeProc* scaleProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_QueryTimeProc_TCL_DECLARED
 #define Tcl_QueryTimeProc_TCL_DECLARED
 /* 553 */
-EXTERN void		Tcl_QueryTimeProc (Tcl_GetTimeProc** getProc, 
-				Tcl_ScaleTimeProc** scaleProc, 
+EXTERN void		Tcl_QueryTimeProc (Tcl_GetTimeProc** getProc,
+				Tcl_ScaleTimeProc** scaleProc,
 				ClientData* clientData);
 #endif
 #ifndef Tcl_ChannelThreadActionProc_TCL_DECLARED
 #define Tcl_ChannelThreadActionProc_TCL_DECLARED
 /* 554 */
 EXTERN Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_NewBignumObj_TCL_DECLARED
 #define Tcl_NewBignumObj_TCL_DECLARED
@@ -3366,7 +3366,7 @@ EXTERN Tcl_Obj*		Tcl_NewBignumObj (mp_int* value);
 #ifndef Tcl_DbNewBignumObj_TCL_DECLARED
 #define Tcl_DbNewBignumObj_TCL_DECLARED
 /* 556 */
-EXTERN Tcl_Obj*		Tcl_DbNewBignumObj (mp_int* value, CONST char* file, 
+EXTERN Tcl_Obj*		Tcl_DbNewBignumObj (mp_int* value, const char* file,
 				int line);
 #endif
 #ifndef Tcl_SetBignumObj_TCL_DECLARED
@@ -3377,37 +3377,37 @@ EXTERN void		Tcl_SetBignumObj (Tcl_Obj* obj, mp_int* value);
 #ifndef Tcl_GetBignumFromObj_TCL_DECLARED
 #define Tcl_GetBignumFromObj_TCL_DECLARED
 /* 558 */
-EXTERN int		Tcl_GetBignumFromObj (Tcl_Interp* interp, 
+EXTERN int		Tcl_GetBignumFromObj (Tcl_Interp* interp,
 				Tcl_Obj* obj, mp_int* value);
 #endif
 #ifndef Tcl_TakeBignumFromObj_TCL_DECLARED
 #define Tcl_TakeBignumFromObj_TCL_DECLARED
 /* 559 */
-EXTERN int		Tcl_TakeBignumFromObj (Tcl_Interp* interp, 
+EXTERN int		Tcl_TakeBignumFromObj (Tcl_Interp* interp,
 				Tcl_Obj* obj, mp_int* value);
 #endif
 #ifndef Tcl_TruncateChannel_TCL_DECLARED
 #define Tcl_TruncateChannel_TCL_DECLARED
 /* 560 */
-EXTERN int		Tcl_TruncateChannel (Tcl_Channel chan, 
+EXTERN int		Tcl_TruncateChannel (Tcl_Channel chan,
 				Tcl_WideInt length);
 #endif
 #ifndef Tcl_ChannelTruncateProc_TCL_DECLARED
 #define Tcl_ChannelTruncateProc_TCL_DECLARED
 /* 561 */
 EXTERN Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc (
-				CONST Tcl_ChannelType * chanTypePtr);
+				const Tcl_ChannelType * chanTypePtr);
 #endif
 #ifndef Tcl_SetChannelErrorInterp_TCL_DECLARED
 #define Tcl_SetChannelErrorInterp_TCL_DECLARED
 /* 562 */
-EXTERN void		Tcl_SetChannelErrorInterp (Tcl_Interp* interp, 
+EXTERN void		Tcl_SetChannelErrorInterp (Tcl_Interp* interp,
 				Tcl_Obj* msg);
 #endif
 #ifndef Tcl_GetChannelErrorInterp_TCL_DECLARED
 #define Tcl_GetChannelErrorInterp_TCL_DECLARED
 /* 563 */
-EXTERN void		Tcl_GetChannelErrorInterp (Tcl_Interp* interp, 
+EXTERN void		Tcl_GetChannelErrorInterp (Tcl_Interp* interp,
 				Tcl_Obj** msg);
 #endif
 #ifndef Tcl_SetChannelError_TCL_DECLARED
@@ -3423,25 +3423,25 @@ EXTERN void		Tcl_GetChannelError (Tcl_Channel chan, Tcl_Obj** msg);
 #ifndef Tcl_InitBignumFromDouble_TCL_DECLARED
 #define Tcl_InitBignumFromDouble_TCL_DECLARED
 /* 566 */
-EXTERN int		Tcl_InitBignumFromDouble (Tcl_Interp* interp, 
+EXTERN int		Tcl_InitBignumFromDouble (Tcl_Interp* interp,
 				double initval, mp_int * toInit);
 #endif
 #ifndef Tcl_GetNamespaceUnknownHandler_TCL_DECLARED
 #define Tcl_GetNamespaceUnknownHandler_TCL_DECLARED
 /* 567 */
-EXTERN Tcl_Obj *	Tcl_GetNamespaceUnknownHandler (Tcl_Interp * interp, 
+EXTERN Tcl_Obj *	Tcl_GetNamespaceUnknownHandler (Tcl_Interp * interp,
 				Tcl_Namespace * nsPtr);
 #endif
 #ifndef Tcl_SetNamespaceUnknownHandler_TCL_DECLARED
 #define Tcl_SetNamespaceUnknownHandler_TCL_DECLARED
 /* 568 */
-EXTERN int		Tcl_SetNamespaceUnknownHandler (Tcl_Interp * interp, 
+EXTERN int		Tcl_SetNamespaceUnknownHandler (Tcl_Interp * interp,
 				Tcl_Namespace * nsPtr, Tcl_Obj * handlerPtr);
 #endif
 #ifndef Tcl_GetEncodingFromObj_TCL_DECLARED
 #define Tcl_GetEncodingFromObj_TCL_DECLARED
 /* 569 */
-EXTERN int		Tcl_GetEncodingFromObj (Tcl_Interp* interp, 
+EXTERN int		Tcl_GetEncodingFromObj (Tcl_Interp* interp,
 				Tcl_Obj* objPtr, Tcl_Encoding* encodingPtr);
 #endif
 #ifndef Tcl_GetEncodingSearchPath_TCL_DECLARED
@@ -3457,59 +3457,59 @@ EXTERN int		Tcl_SetEncodingSearchPath (Tcl_Obj* searchPath);
 #ifndef Tcl_GetEncodingNameFromEnvironment_TCL_DECLARED
 #define Tcl_GetEncodingNameFromEnvironment_TCL_DECLARED
 /* 572 */
-EXTERN CONST char *	Tcl_GetEncodingNameFromEnvironment (
+EXTERN const char *	Tcl_GetEncodingNameFromEnvironment (
 				Tcl_DString* bufPtr);
 #endif
 #ifndef Tcl_PkgRequireProc_TCL_DECLARED
 #define Tcl_PkgRequireProc_TCL_DECLARED
 /* 573 */
-EXTERN int		Tcl_PkgRequireProc (Tcl_Interp * interp, 
-				CONST char * name, int objc, 
-				Tcl_Obj *CONST objv[], 
+EXTERN int		Tcl_PkgRequireProc (Tcl_Interp * interp,
+				const char * name, int objc,
+				Tcl_Obj *const objv[],
 				ClientData * clientDataPtr);
 #endif
 #ifndef Tcl_AppendObjToErrorInfo_TCL_DECLARED
 #define Tcl_AppendObjToErrorInfo_TCL_DECLARED
 /* 574 */
-EXTERN void		Tcl_AppendObjToErrorInfo (Tcl_Interp * interp, 
+EXTERN void		Tcl_AppendObjToErrorInfo (Tcl_Interp * interp,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_AppendLimitedToObj_TCL_DECLARED
 #define Tcl_AppendLimitedToObj_TCL_DECLARED
 /* 575 */
-EXTERN void		Tcl_AppendLimitedToObj (Tcl_Obj * objPtr, 
-				CONST char * bytes, int length, int limit, 
-				CONST char * ellipsis);
+EXTERN void		Tcl_AppendLimitedToObj (Tcl_Obj * objPtr,
+				const char * bytes, int length, int limit,
+				const char * ellipsis);
 #endif
 #ifndef Tcl_Format_TCL_DECLARED
 #define Tcl_Format_TCL_DECLARED
 /* 576 */
-EXTERN Tcl_Obj *	Tcl_Format (Tcl_Interp * interp, CONST char * format, 
-				int objc, Tcl_Obj * CONST objv[]);
+EXTERN Tcl_Obj *	Tcl_Format (Tcl_Interp * interp, const char * format,
+				int objc, Tcl_Obj * const objv[]);
 #endif
 #ifndef Tcl_AppendFormatToObj_TCL_DECLARED
 #define Tcl_AppendFormatToObj_TCL_DECLARED
 /* 577 */
-EXTERN int		Tcl_AppendFormatToObj (Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, CONST char * format, 
-				int objc, Tcl_Obj * CONST objv[]);
+EXTERN int		Tcl_AppendFormatToObj (Tcl_Interp * interp,
+				Tcl_Obj * objPtr, const char * format,
+				int objc, Tcl_Obj * const objv[]);
 #endif
 #ifndef Tcl_ObjPrintf_TCL_DECLARED
 #define Tcl_ObjPrintf_TCL_DECLARED
 /* 578 */
-EXTERN Tcl_Obj *	Tcl_ObjPrintf (CONST char * format, ...);
+EXTERN Tcl_Obj *	Tcl_ObjPrintf (const char * format, ...);
 #endif
 #ifndef Tcl_AppendPrintfToObj_TCL_DECLARED
 #define Tcl_AppendPrintfToObj_TCL_DECLARED
 /* 579 */
-EXTERN void		Tcl_AppendPrintfToObj (Tcl_Obj * objPtr, 
-				CONST char * format, ...);
+EXTERN void		Tcl_AppendPrintfToObj (Tcl_Obj * objPtr,
+				const char * format, ...);
 #endif
 #ifndef Tcl_CancelEval_TCL_DECLARED
 #define Tcl_CancelEval_TCL_DECLARED
 /* 580 */
-EXTERN int		Tcl_CancelEval (Tcl_Interp * interp, 
-				Tcl_Obj * resultObjPtr, 
+EXTERN int		Tcl_CancelEval (Tcl_Interp * interp,
+				Tcl_Obj * resultObjPtr,
 				ClientData clientData, int flags);
 #endif
 #ifndef Tcl_Canceled_TCL_DECLARED
@@ -3520,52 +3520,52 @@ EXTERN int		Tcl_Canceled (Tcl_Interp * interp, int flags);
 #ifndef Tcl_CreatePipe_TCL_DECLARED
 #define Tcl_CreatePipe_TCL_DECLARED
 /* 582 */
-EXTERN int		Tcl_CreatePipe (Tcl_Interp * interp, 
-				Tcl_Channel * rchan, Tcl_Channel * wchan, 
+EXTERN int		Tcl_CreatePipe (Tcl_Interp * interp,
+				Tcl_Channel * rchan, Tcl_Channel * wchan,
 				int flags);
 #endif
 #ifndef Tcl_NRCreateCommand_TCL_DECLARED
 #define Tcl_NRCreateCommand_TCL_DECLARED
 /* 583 */
-EXTERN Tcl_Command	Tcl_NRCreateCommand (Tcl_Interp * interp, 
-				CONST char * cmdName, Tcl_ObjCmdProc * proc, 
-				Tcl_ObjCmdProc * nreProc, 
-				ClientData clientData, 
+EXTERN Tcl_Command	Tcl_NRCreateCommand (Tcl_Interp * interp,
+				const char * cmdName, Tcl_ObjCmdProc * proc,
+				Tcl_ObjCmdProc * nreProc,
+				ClientData clientData,
 				Tcl_CmdDeleteProc * deleteProc);
 #endif
 #ifndef Tcl_NREvalObj_TCL_DECLARED
 #define Tcl_NREvalObj_TCL_DECLARED
 /* 584 */
-EXTERN int		Tcl_NREvalObj (Tcl_Interp * interp, Tcl_Obj * objPtr, 
+EXTERN int		Tcl_NREvalObj (Tcl_Interp * interp, Tcl_Obj * objPtr,
 				int flags);
 #endif
 #ifndef Tcl_NREvalObjv_TCL_DECLARED
 #define Tcl_NREvalObjv_TCL_DECLARED
 /* 585 */
-EXTERN int		Tcl_NREvalObjv (Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[], int flags);
+EXTERN int		Tcl_NREvalObjv (Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[], int flags);
 #endif
 #ifndef Tcl_NRCmdSwap_TCL_DECLARED
 #define Tcl_NRCmdSwap_TCL_DECLARED
 /* 586 */
-EXTERN int		Tcl_NRCmdSwap (Tcl_Interp * interp, Tcl_Command cmd, 
-				int objc, Tcl_Obj *CONST objv[], int flags);
+EXTERN int		Tcl_NRCmdSwap (Tcl_Interp * interp, Tcl_Command cmd,
+				int objc, Tcl_Obj *const objv[], int flags);
 #endif
 #ifndef Tcl_NRAddCallback_TCL_DECLARED
 #define Tcl_NRAddCallback_TCL_DECLARED
 /* 587 */
-EXTERN void		Tcl_NRAddCallback (Tcl_Interp * interp, 
-				Tcl_NRPostProc * postProcPtr, 
-				ClientData data0, ClientData data1, 
+EXTERN void		Tcl_NRAddCallback (Tcl_Interp * interp,
+				Tcl_NRPostProc * postProcPtr,
+				ClientData data0, ClientData data1,
 				ClientData data2, ClientData data3);
 #endif
 #ifndef Tcl_NRCallObjProc_TCL_DECLARED
 #define Tcl_NRCallObjProc_TCL_DECLARED
 /* 588 */
-EXTERN int		Tcl_NRCallObjProc (Tcl_Interp * interp, 
-				Tcl_ObjCmdProc * objProc, 
-				ClientData clientData, int objc, 
-				Tcl_Obj *CONST objv[]);
+EXTERN int		Tcl_NRCallObjProc (Tcl_Interp * interp,
+				Tcl_ObjCmdProc * objProc,
+				ClientData clientData, int objc,
+				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_GetFSDeviceFromStat_TCL_DECLARED
 #define Tcl_GetFSDeviceFromStat_TCL_DECLARED
@@ -3641,42 +3641,42 @@ EXTERN unsigned		Tcl_GetBlockSizeFromStat (
 #ifndef Tcl_SetEnsembleParameterList_TCL_DECLARED
 #define Tcl_SetEnsembleParameterList_TCL_DECLARED
 /* 602 */
-EXTERN int		Tcl_SetEnsembleParameterList (Tcl_Interp * interp, 
+EXTERN int		Tcl_SetEnsembleParameterList (Tcl_Interp * interp,
 				Tcl_Command token, Tcl_Obj * paramList);
 #endif
 #ifndef Tcl_GetEnsembleParameterList_TCL_DECLARED
 #define Tcl_GetEnsembleParameterList_TCL_DECLARED
 /* 603 */
-EXTERN int		Tcl_GetEnsembleParameterList (Tcl_Interp * interp, 
+EXTERN int		Tcl_GetEnsembleParameterList (Tcl_Interp * interp,
 				Tcl_Command token, Tcl_Obj ** paramListPtr);
 #endif
 #ifndef Tcl_ParseArgsObjv_TCL_DECLARED
 #define Tcl_ParseArgsObjv_TCL_DECLARED
 /* 604 */
-EXTERN int		Tcl_ParseArgsObjv (Tcl_Interp * interp, 
-				const Tcl_ArgvInfo * argTable, int * objcPtr, 
+EXTERN int		Tcl_ParseArgsObjv (Tcl_Interp * interp,
+				const Tcl_ArgvInfo * argTable, int * objcPtr,
 				Tcl_Obj *const * objv, Tcl_Obj *** remObjv);
 #endif
 
 typedef struct TclStubHooks {
-    CONST struct TclPlatStubs *tclPlatStubs;
-    CONST struct TclIntStubs *tclIntStubs;
-    CONST struct TclIntPlatStubs *tclIntPlatStubs;
+    const struct TclPlatStubs *tclPlatStubs;
+    const struct TclIntStubs *tclIntStubs;
+    const struct TclIntPlatStubs *tclIntPlatStubs;
 } TclStubHooks;
 
 typedef struct TclStubs {
     int magic;
-    CONST struct TclStubHooks *hooks;
+    const struct TclStubHooks *hooks;
 
-    int (*tcl_PkgProvideEx) (Tcl_Interp* interp, CONST char* name, CONST char* version, ClientData clientData); /* 0 */
-    CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact, ClientData * clientDataPtr); /* 1 */
-    void (*tcl_Panic) (CONST char * format, ...); /* 2 */
+    int (*tcl_PkgProvideEx) (Tcl_Interp* interp, const char* name, const char* version, ClientData clientData); /* 0 */
+    CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp * interp, const char * name, const char * version, int exact, ClientData * clientDataPtr); /* 1 */
+    void (*tcl_Panic) (const char * format, ...); /* 2 */
     char * (*tcl_Alloc) (unsigned int size); /* 3 */
     void (*tcl_Free) (char * ptr); /* 4 */
     char * (*tcl_Realloc) (char * ptr, unsigned int size); /* 5 */
-    char * (*tcl_DbCkalloc) (unsigned int size, CONST char * file, int line); /* 6 */
-    int (*tcl_DbCkfree) (char * ptr, CONST char * file, int line); /* 7 */
-    char * (*tcl_DbCkrealloc) (char * ptr, unsigned int size, CONST char * file, int line); /* 8 */
+    char * (*tcl_DbCkalloc) (unsigned int size, const char * file, int line); /* 6 */
+    int (*tcl_DbCkfree) (char * ptr, const char * file, int line); /* 7 */
+    char * (*tcl_DbCkrealloc) (char * ptr, unsigned int size, const char * file, int line); /* 8 */
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
     void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc * proc, ClientData clientData); /* 9 */
 #endif /* UNIX */
@@ -3695,36 +3695,36 @@ typedef struct TclStubs {
 #ifdef MAC_OSX_TCL /* MACOSX */
     void (*tcl_DeleteFileHandler) (int fd); /* 10 */
 #endif /* MACOSX */
-    void (*tcl_SetTimer) (CONST Tcl_Time * timePtr); /* 11 */
+    void (*tcl_SetTimer) (const Tcl_Time * timePtr); /* 11 */
     void (*tcl_Sleep) (int ms); /* 12 */
-    int (*tcl_WaitForEvent) (CONST Tcl_Time * timePtr); /* 13 */
+    int (*tcl_WaitForEvent) (const Tcl_Time * timePtr); /* 13 */
     int (*tcl_AppendAllObjTypes) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 14 */
     void (*tcl_AppendStringsToObj) (Tcl_Obj * objPtr, ...); /* 15 */
-    void (*tcl_AppendToObj) (Tcl_Obj* objPtr, CONST char* bytes, int length); /* 16 */
-    Tcl_Obj * (*tcl_ConcatObj) (int objc, Tcl_Obj *CONST objv[]); /* 17 */
-    int (*tcl_ConvertToType) (Tcl_Interp * interp, Tcl_Obj * objPtr, CONST Tcl_ObjType * typePtr); /* 18 */
-    void (*tcl_DbDecrRefCount) (Tcl_Obj * objPtr, CONST char * file, int line); /* 19 */
-    void (*tcl_DbIncrRefCount) (Tcl_Obj * objPtr, CONST char * file, int line); /* 20 */
-    int (*tcl_DbIsShared) (Tcl_Obj * objPtr, CONST char * file, int line); /* 21 */
-    Tcl_Obj * (*tcl_DbNewBooleanObj) (int boolValue, CONST char * file, int line); /* 22 */
-    Tcl_Obj * (*tcl_DbNewByteArrayObj) (CONST unsigned char * bytes, int length, CONST char * file, int line); /* 23 */
-    Tcl_Obj * (*tcl_DbNewDoubleObj) (double doubleValue, CONST char * file, int line); /* 24 */
-    Tcl_Obj * (*tcl_DbNewListObj) (int objc, Tcl_Obj *CONST * objv, CONST char * file, int line); /* 25 */
-    Tcl_Obj * (*tcl_DbNewLongObj) (long longValue, CONST char * file, int line); /* 26 */
-    Tcl_Obj * (*tcl_DbNewObj) (CONST char * file, int line); /* 27 */
-    Tcl_Obj * (*tcl_DbNewStringObj) (CONST char * bytes, int length, CONST char * file, int line); /* 28 */
+    void (*tcl_AppendToObj) (Tcl_Obj* objPtr, const char* bytes, int length); /* 16 */
+    Tcl_Obj * (*tcl_ConcatObj) (int objc, Tcl_Obj *const objv[]); /* 17 */
+    int (*tcl_ConvertToType) (Tcl_Interp * interp, Tcl_Obj * objPtr, const Tcl_ObjType * typePtr); /* 18 */
+    void (*tcl_DbDecrRefCount) (Tcl_Obj * objPtr, const char * file, int line); /* 19 */
+    void (*tcl_DbIncrRefCount) (Tcl_Obj * objPtr, const char * file, int line); /* 20 */
+    int (*tcl_DbIsShared) (Tcl_Obj * objPtr, const char * file, int line); /* 21 */
+    Tcl_Obj * (*tcl_DbNewBooleanObj) (int boolValue, const char * file, int line); /* 22 */
+    Tcl_Obj * (*tcl_DbNewByteArrayObj) (const unsigned char * bytes, int length, const char * file, int line); /* 23 */
+    Tcl_Obj * (*tcl_DbNewDoubleObj) (double doubleValue, const char * file, int line); /* 24 */
+    Tcl_Obj * (*tcl_DbNewListObj) (int objc, Tcl_Obj *const * objv, const char * file, int line); /* 25 */
+    Tcl_Obj * (*tcl_DbNewLongObj) (long longValue, const char * file, int line); /* 26 */
+    Tcl_Obj * (*tcl_DbNewObj) (const char * file, int line); /* 27 */
+    Tcl_Obj * (*tcl_DbNewStringObj) (const char * bytes, int length, const char * file, int line); /* 28 */
     Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj * objPtr); /* 29 */
     void (*tclFreeObj) (Tcl_Obj * objPtr); /* 30 */
-    int (*tcl_GetBoolean) (Tcl_Interp * interp, CONST char * src, int * boolPtr); /* 31 */
+    int (*tcl_GetBoolean) (Tcl_Interp * interp, const char * src, int * boolPtr); /* 31 */
     int (*tcl_GetBooleanFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int * boolPtr); /* 32 */
     unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj * objPtr, int * lengthPtr); /* 33 */
-    int (*tcl_GetDouble) (Tcl_Interp * interp, CONST char * src, double * doublePtr); /* 34 */
+    int (*tcl_GetDouble) (Tcl_Interp * interp, const char * src, double * doublePtr); /* 34 */
     int (*tcl_GetDoubleFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, double * doublePtr); /* 35 */
-    int (*tcl_GetIndexFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, CONST84 char *CONST * tablePtr, CONST char * msg, int flags, int * indexPtr); /* 36 */
-    int (*tcl_GetInt) (Tcl_Interp * interp, CONST char * src, int * intPtr); /* 37 */
+    int (*tcl_GetIndexFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, CONST84 char *const * tablePtr, const char * msg, int flags, int * indexPtr); /* 36 */
+    int (*tcl_GetInt) (Tcl_Interp * interp, const char * src, int * intPtr); /* 37 */
     int (*tcl_GetIntFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int * intPtr); /* 38 */
     int (*tcl_GetLongFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, long * longPtr); /* 39 */
-    CONST86 Tcl_ObjType * (*tcl_GetObjType) (CONST char * typeName); /* 40 */
+    CONST86 Tcl_ObjType * (*tcl_GetObjType) (const char * typeName); /* 40 */
     char * (*tcl_GetStringFromObj) (Tcl_Obj * objPtr, int * lengthPtr); /* 41 */
     void (*tcl_InvalidateStringRep) (Tcl_Obj * objPtr); /* 42 */
     int (*tcl_ListObjAppendList) (Tcl_Interp * interp, Tcl_Obj * listPtr, Tcl_Obj * elemListPtr); /* 43 */
@@ -3732,28 +3732,28 @@ typedef struct TclStubs {
     int (*tcl_ListObjGetElements) (Tcl_Interp * interp, Tcl_Obj * listPtr, int * objcPtr, Tcl_Obj *** objvPtr); /* 45 */
     int (*tcl_ListObjIndex) (Tcl_Interp * interp, Tcl_Obj * listPtr, int index, Tcl_Obj ** objPtrPtr); /* 46 */
     int (*tcl_ListObjLength) (Tcl_Interp * interp, Tcl_Obj * listPtr, int * lengthPtr); /* 47 */
-    int (*tcl_ListObjReplace) (Tcl_Interp * interp, Tcl_Obj * listPtr, int first, int count, int objc, Tcl_Obj *CONST objv[]); /* 48 */
+    int (*tcl_ListObjReplace) (Tcl_Interp * interp, Tcl_Obj * listPtr, int first, int count, int objc, Tcl_Obj *const objv[]); /* 48 */
     Tcl_Obj * (*tcl_NewBooleanObj) (int boolValue); /* 49 */
-    Tcl_Obj * (*tcl_NewByteArrayObj) (CONST unsigned char* bytes, int length); /* 50 */
+    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char* bytes, int length); /* 50 */
     Tcl_Obj * (*tcl_NewDoubleObj) (double doubleValue); /* 51 */
     Tcl_Obj * (*tcl_NewIntObj) (int intValue); /* 52 */
-    Tcl_Obj * (*tcl_NewListObj) (int objc, Tcl_Obj *CONST objv[]); /* 53 */
+    Tcl_Obj * (*tcl_NewListObj) (int objc, Tcl_Obj *const objv[]); /* 53 */
     Tcl_Obj * (*tcl_NewLongObj) (long longValue); /* 54 */
     Tcl_Obj * (*tcl_NewObj) (void); /* 55 */
-    Tcl_Obj * (*tcl_NewStringObj) (CONST char * bytes, int length); /* 56 */
+    Tcl_Obj * (*tcl_NewStringObj) (const char * bytes, int length); /* 56 */
     void (*tcl_SetBooleanObj) (Tcl_Obj * objPtr, int boolValue); /* 57 */
     unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj * objPtr, int length); /* 58 */
-    void (*tcl_SetByteArrayObj) (Tcl_Obj * objPtr, CONST unsigned char * bytes, int length); /* 59 */
+    void (*tcl_SetByteArrayObj) (Tcl_Obj * objPtr, const unsigned char * bytes, int length); /* 59 */
     void (*tcl_SetDoubleObj) (Tcl_Obj * objPtr, double doubleValue); /* 60 */
     void (*tcl_SetIntObj) (Tcl_Obj * objPtr, int intValue); /* 61 */
-    void (*tcl_SetListObj) (Tcl_Obj * objPtr, int objc, Tcl_Obj *CONST objv[]); /* 62 */
+    void (*tcl_SetListObj) (Tcl_Obj * objPtr, int objc, Tcl_Obj *const objv[]); /* 62 */
     void (*tcl_SetLongObj) (Tcl_Obj * objPtr, long longValue); /* 63 */
     void (*tcl_SetObjLength) (Tcl_Obj * objPtr, int length); /* 64 */
-    void (*tcl_SetStringObj) (Tcl_Obj* objPtr, CONST char* bytes, int length); /* 65 */
-    void (*tcl_AddErrorInfo) (Tcl_Interp * interp, CONST char * message); /* 66 */
-    void (*tcl_AddObjErrorInfo) (Tcl_Interp * interp, CONST char * message, int length); /* 67 */
+    void (*tcl_SetStringObj) (Tcl_Obj* objPtr, const char* bytes, int length); /* 65 */
+    void (*tcl_AddErrorInfo) (Tcl_Interp * interp, const char * message); /* 66 */
+    void (*tcl_AddObjErrorInfo) (Tcl_Interp * interp, const char * message, int length); /* 67 */
     void (*tcl_AllowExceptions) (Tcl_Interp * interp); /* 68 */
-    void (*tcl_AppendElement) (Tcl_Interp * interp, CONST char * element); /* 69 */
+    void (*tcl_AppendElement) (Tcl_Interp * interp, const char * element); /* 69 */
     void (*tcl_AppendResult) (Tcl_Interp * interp, ...); /* 70 */
     Tcl_AsyncHandler (*tcl_AsyncCreate) (Tcl_AsyncProc * proc, ClientData clientData); /* 71 */
     void (*tcl_AsyncDelete) (Tcl_AsyncHandler async); /* 72 */
@@ -3761,33 +3761,33 @@ typedef struct TclStubs {
     void (*tcl_AsyncMark) (Tcl_AsyncHandler async); /* 74 */
     int (*tcl_AsyncReady) (void); /* 75 */
     void (*tcl_BackgroundError) (Tcl_Interp * interp); /* 76 */
-    char (*tcl_Backslash) (CONST char * src, int * readPtr); /* 77 */
-    int (*tcl_BadChannelOption) (Tcl_Interp * interp, CONST char * optionName, CONST char * optionList); /* 78 */
+    char (*tcl_Backslash) (const char * src, int * readPtr); /* 77 */
+    int (*tcl_BadChannelOption) (Tcl_Interp * interp, const char * optionName, const char * optionList); /* 78 */
     void (*tcl_CallWhenDeleted) (Tcl_Interp * interp, Tcl_InterpDeleteProc * proc, ClientData clientData); /* 79 */
     void (*tcl_CancelIdleCall) (Tcl_IdleProc * idleProc, ClientData clientData); /* 80 */
     int (*tcl_Close) (Tcl_Interp * interp, Tcl_Channel chan); /* 81 */
-    int (*tcl_CommandComplete) (CONST char * cmd); /* 82 */
-    char * (*tcl_Concat) (int argc, CONST84 char * CONST * argv); /* 83 */
-    int (*tcl_ConvertElement) (CONST char * src, char * dst, int flags); /* 84 */
-    int (*tcl_ConvertCountedElement) (CONST char * src, int length, char * dst, int flags); /* 85 */
-    int (*tcl_CreateAlias) (Tcl_Interp * slave, CONST char * slaveCmd, Tcl_Interp * target, CONST char * targetCmd, int argc, CONST84 char * CONST * argv); /* 86 */
-    int (*tcl_CreateAliasObj) (Tcl_Interp * slave, CONST char * slaveCmd, Tcl_Interp * target, CONST char * targetCmd, int objc, Tcl_Obj *CONST objv[]); /* 87 */
-    Tcl_Channel (*tcl_CreateChannel) (CONST Tcl_ChannelType * typePtr, CONST char * chanName, ClientData instanceData, int mask); /* 88 */
+    int (*tcl_CommandComplete) (const char * cmd); /* 82 */
+    char * (*tcl_Concat) (int argc, CONST84 char * const * argv); /* 83 */
+    int (*tcl_ConvertElement) (const char * src, char * dst, int flags); /* 84 */
+    int (*tcl_ConvertCountedElement) (const char * src, int length, char * dst, int flags); /* 85 */
+    int (*tcl_CreateAlias) (Tcl_Interp * slave, const char * slaveCmd, Tcl_Interp * target, const char * targetCmd, int argc, CONST84 char * const * argv); /* 86 */
+    int (*tcl_CreateAliasObj) (Tcl_Interp * slave, const char * slaveCmd, Tcl_Interp * target, const char * targetCmd, int objc, Tcl_Obj *const objv[]); /* 87 */
+    Tcl_Channel (*tcl_CreateChannel) (const Tcl_ChannelType * typePtr, const char * chanName, ClientData instanceData, int mask); /* 88 */
     void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc * proc, ClientData clientData); /* 89 */
     void (*tcl_CreateCloseHandler) (Tcl_Channel chan, Tcl_CloseProc * proc, ClientData clientData); /* 90 */
-    Tcl_Command (*tcl_CreateCommand) (Tcl_Interp * interp, CONST char * cmdName, Tcl_CmdProc * proc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 91 */
+    Tcl_Command (*tcl_CreateCommand) (Tcl_Interp * interp, const char * cmdName, Tcl_CmdProc * proc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 91 */
     void (*tcl_CreateEventSource) (Tcl_EventSetupProc * setupProc, Tcl_EventCheckProc * checkProc, ClientData clientData); /* 92 */
     void (*tcl_CreateExitHandler) (Tcl_ExitProc * proc, ClientData clientData); /* 93 */
     Tcl_Interp * (*tcl_CreateInterp) (void); /* 94 */
-    void (*tcl_CreateMathFunc) (Tcl_Interp * interp, CONST char * name, int numArgs, Tcl_ValueType * argTypes, Tcl_MathProc * proc, ClientData clientData); /* 95 */
-    Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp * interp, CONST char * cmdName, Tcl_ObjCmdProc * proc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 96 */
-    Tcl_Interp * (*tcl_CreateSlave) (Tcl_Interp * interp, CONST char * slaveName, int isSafe); /* 97 */
+    void (*tcl_CreateMathFunc) (Tcl_Interp * interp, const char * name, int numArgs, Tcl_ValueType * argTypes, Tcl_MathProc * proc, ClientData clientData); /* 95 */
+    Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp * interp, const char * cmdName, Tcl_ObjCmdProc * proc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 96 */
+    Tcl_Interp * (*tcl_CreateSlave) (Tcl_Interp * interp, const char * slaveName, int isSafe); /* 97 */
     Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc * proc, ClientData clientData); /* 98 */
     Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp * interp, int level, Tcl_CmdTraceProc * proc, ClientData clientData); /* 99 */
-    void (*tcl_DeleteAssocData) (Tcl_Interp * interp, CONST char * name); /* 100 */
+    void (*tcl_DeleteAssocData) (Tcl_Interp * interp, const char * name); /* 100 */
     void (*tcl_DeleteChannelHandler) (Tcl_Channel chan, Tcl_ChannelProc * proc, ClientData clientData); /* 101 */
     void (*tcl_DeleteCloseHandler) (Tcl_Channel chan, Tcl_CloseProc * proc, ClientData clientData); /* 102 */
-    int (*tcl_DeleteCommand) (Tcl_Interp * interp, CONST char * cmdName); /* 103 */
+    int (*tcl_DeleteCommand) (Tcl_Interp * interp, const char * cmdName); /* 103 */
     int (*tcl_DeleteCommandFromToken) (Tcl_Interp * interp, Tcl_Command command); /* 104 */
     void (*tcl_DeleteEvents) (Tcl_EventDeleteProc * proc, ClientData clientData); /* 105 */
     void (*tcl_DeleteEventSource) (Tcl_EventSetupProc * setupProc, Tcl_EventCheckProc * checkProc, ClientData clientData); /* 106 */
@@ -3809,8 +3809,8 @@ typedef struct TclStubs {
     void (*tcl_DontCallWhenDeleted) (Tcl_Interp * interp, Tcl_InterpDeleteProc * proc, ClientData clientData); /* 114 */
     int (*tcl_DoOneEvent) (int flags); /* 115 */
     void (*tcl_DoWhenIdle) (Tcl_IdleProc * proc, ClientData clientData); /* 116 */
-    char * (*tcl_DStringAppend) (Tcl_DString * dsPtr, CONST char * bytes, int length); /* 117 */
-    char * (*tcl_DStringAppendElement) (Tcl_DString * dsPtr, CONST char * element); /* 118 */
+    char * (*tcl_DStringAppend) (Tcl_DString * dsPtr, const char * bytes, int length); /* 117 */
+    char * (*tcl_DStringAppendElement) (Tcl_DString * dsPtr, const char * element); /* 118 */
     void (*tcl_DStringEndSublist) (Tcl_DString * dsPtr); /* 119 */
     void (*tcl_DStringFree) (Tcl_DString * dsPtr); /* 120 */
     void (*tcl_DStringGetResult) (Tcl_Interp * interp, Tcl_DString * dsPtr); /* 121 */
@@ -3821,78 +3821,78 @@ typedef struct TclStubs {
     int (*tcl_Eof) (Tcl_Channel chan); /* 126 */
     CONST84_RETURN char * (*tcl_ErrnoId) (void); /* 127 */
     CONST84_RETURN char * (*tcl_ErrnoMsg) (int err); /* 128 */
-    int (*tcl_Eval) (Tcl_Interp * interp, CONST char * script); /* 129 */
-    int (*tcl_EvalFile) (Tcl_Interp * interp, CONST char * fileName); /* 130 */
+    int (*tcl_Eval) (Tcl_Interp * interp, const char * script); /* 129 */
+    int (*tcl_EvalFile) (Tcl_Interp * interp, const char * fileName); /* 130 */
     int (*tcl_EvalObj) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 131 */
     void (*tcl_EventuallyFree) (ClientData clientData, Tcl_FreeProc * freeProc); /* 132 */
     void (*tcl_Exit) (int status); /* 133 */
-    int (*tcl_ExposeCommand) (Tcl_Interp * interp, CONST char * hiddenCmdToken, CONST char * cmdName); /* 134 */
-    int (*tcl_ExprBoolean) (Tcl_Interp * interp, CONST char * expr, int * ptr); /* 135 */
+    int (*tcl_ExposeCommand) (Tcl_Interp * interp, const char * hiddenCmdToken, const char * cmdName); /* 134 */
+    int (*tcl_ExprBoolean) (Tcl_Interp * interp, const char * expr, int * ptr); /* 135 */
     int (*tcl_ExprBooleanObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int * ptr); /* 136 */
-    int (*tcl_ExprDouble) (Tcl_Interp * interp, CONST char * expr, double * ptr); /* 137 */
+    int (*tcl_ExprDouble) (Tcl_Interp * interp, const char * expr, double * ptr); /* 137 */
     int (*tcl_ExprDoubleObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, double * ptr); /* 138 */
-    int (*tcl_ExprLong) (Tcl_Interp * interp, CONST char * expr, long * ptr); /* 139 */
+    int (*tcl_ExprLong) (Tcl_Interp * interp, const char * expr, long * ptr); /* 139 */
     int (*tcl_ExprLongObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, long * ptr); /* 140 */
     int (*tcl_ExprObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, Tcl_Obj ** resultPtrPtr); /* 141 */
-    int (*tcl_ExprString) (Tcl_Interp * interp, CONST char * expr); /* 142 */
+    int (*tcl_ExprString) (Tcl_Interp * interp, const char * expr); /* 142 */
     void (*tcl_Finalize) (void); /* 143 */
-    void (*tcl_FindExecutable) (CONST char * argv0); /* 144 */
+    void (*tcl_FindExecutable) (const char * argv0); /* 144 */
     Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable * tablePtr, Tcl_HashSearch * searchPtr); /* 145 */
     int (*tcl_Flush) (Tcl_Channel chan); /* 146 */
     void (*tcl_FreeResult) (Tcl_Interp * interp); /* 147 */
-    int (*tcl_GetAlias) (Tcl_Interp * interp, CONST char * slaveCmd, Tcl_Interp ** targetInterpPtr, CONST84 char ** targetCmdPtr, int * argcPtr, CONST84 char *** argvPtr); /* 148 */
-    int (*tcl_GetAliasObj) (Tcl_Interp * interp, CONST char * slaveCmd, Tcl_Interp ** targetInterpPtr, CONST84 char ** targetCmdPtr, int * objcPtr, Tcl_Obj *** objv); /* 149 */
-    ClientData (*tcl_GetAssocData) (Tcl_Interp * interp, CONST char * name, Tcl_InterpDeleteProc ** procPtr); /* 150 */
-    Tcl_Channel (*tcl_GetChannel) (Tcl_Interp * interp, CONST char * chanName, int * modePtr); /* 151 */
+    int (*tcl_GetAlias) (Tcl_Interp * interp, const char * slaveCmd, Tcl_Interp ** targetInterpPtr, CONST84 char ** targetCmdPtr, int * argcPtr, CONST84 char *** argvPtr); /* 148 */
+    int (*tcl_GetAliasObj) (Tcl_Interp * interp, const char * slaveCmd, Tcl_Interp ** targetInterpPtr, CONST84 char ** targetCmdPtr, int * objcPtr, Tcl_Obj *** objv); /* 149 */
+    ClientData (*tcl_GetAssocData) (Tcl_Interp * interp, const char * name, Tcl_InterpDeleteProc ** procPtr); /* 150 */
+    Tcl_Channel (*tcl_GetChannel) (Tcl_Interp * interp, const char * chanName, int * modePtr); /* 151 */
     int (*tcl_GetChannelBufferSize) (Tcl_Channel chan); /* 152 */
     int (*tcl_GetChannelHandle) (Tcl_Channel chan, int direction, ClientData * handlePtr); /* 153 */
     ClientData (*tcl_GetChannelInstanceData) (Tcl_Channel chan); /* 154 */
     int (*tcl_GetChannelMode) (Tcl_Channel chan); /* 155 */
     CONST84_RETURN char * (*tcl_GetChannelName) (Tcl_Channel chan); /* 156 */
-    int (*tcl_GetChannelOption) (Tcl_Interp * interp, Tcl_Channel chan, CONST char * optionName, Tcl_DString * dsPtr); /* 157 */
+    int (*tcl_GetChannelOption) (Tcl_Interp * interp, Tcl_Channel chan, const char * optionName, Tcl_DString * dsPtr); /* 157 */
     CONST86 Tcl_ChannelType * (*tcl_GetChannelType) (Tcl_Channel chan); /* 158 */
-    int (*tcl_GetCommandInfo) (Tcl_Interp * interp, CONST char * cmdName, Tcl_CmdInfo * infoPtr); /* 159 */
+    int (*tcl_GetCommandInfo) (Tcl_Interp * interp, const char * cmdName, Tcl_CmdInfo * infoPtr); /* 159 */
     CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp * interp, Tcl_Command command); /* 160 */
     int (*tcl_GetErrno) (void); /* 161 */
     CONST84_RETURN char * (*tcl_GetHostName) (void); /* 162 */
     int (*tcl_GetInterpPath) (Tcl_Interp * askInterp, Tcl_Interp * slaveInterp); /* 163 */
     Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp * interp); /* 164 */
-    CONST char * (*tcl_GetNameOfExecutable) (void); /* 165 */
+    const char * (*tcl_GetNameOfExecutable) (void); /* 165 */
     Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp * interp); /* 166 */
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
-    int (*tcl_GetOpenFile) (Tcl_Interp * interp, CONST char * chanID, int forWriting, int checkUsage, ClientData * filePtr); /* 167 */
+    int (*tcl_GetOpenFile) (Tcl_Interp * interp, const char * chanID, int forWriting, int checkUsage, ClientData * filePtr); /* 167 */
 #endif /* UNIX */
 #ifdef __WIN32__ /* WIN */
     void *reserved167;
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
-    int (*tcl_GetOpenFile) (Tcl_Interp * interp, CONST char * chanID, int forWriting, int checkUsage, ClientData * filePtr); /* 167 */
+    int (*tcl_GetOpenFile) (Tcl_Interp * interp, const char * chanID, int forWriting, int checkUsage, ClientData * filePtr); /* 167 */
 #endif /* MACOSX */
-    Tcl_PathType (*tcl_GetPathType) (CONST char * path); /* 168 */
+    Tcl_PathType (*tcl_GetPathType) (const char * path); /* 168 */
     int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString * dsPtr); /* 169 */
     int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj * objPtr); /* 170 */
     int (*tcl_GetServiceMode) (void); /* 171 */
-    Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp * interp, CONST char * slaveName); /* 172 */
+    Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp * interp, const char * slaveName); /* 172 */
     Tcl_Channel (*tcl_GetStdChannel) (int type); /* 173 */
     CONST84_RETURN char * (*tcl_GetStringResult) (Tcl_Interp * interp); /* 174 */
-    CONST84_RETURN char * (*tcl_GetVar) (Tcl_Interp * interp, CONST char * varName, int flags); /* 175 */
-    CONST84_RETURN char * (*tcl_GetVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags); /* 176 */
-    int (*tcl_GlobalEval) (Tcl_Interp * interp, CONST char * command); /* 177 */
+    CONST84_RETURN char * (*tcl_GetVar) (Tcl_Interp * interp, const char * varName, int flags); /* 175 */
+    CONST84_RETURN char * (*tcl_GetVar2) (Tcl_Interp * interp, const char * part1, const char * part2, int flags); /* 176 */
+    int (*tcl_GlobalEval) (Tcl_Interp * interp, const char * command); /* 177 */
     int (*tcl_GlobalEvalObj) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 178 */
-    int (*tcl_HideCommand) (Tcl_Interp * interp, CONST char * cmdName, CONST char * hiddenCmdToken); /* 179 */
+    int (*tcl_HideCommand) (Tcl_Interp * interp, const char * cmdName, const char * hiddenCmdToken); /* 179 */
     int (*tcl_Init) (Tcl_Interp * interp); /* 180 */
     void (*tcl_InitHashTable) (Tcl_HashTable * tablePtr, int keyType); /* 181 */
     int (*tcl_InputBlocked) (Tcl_Channel chan); /* 182 */
     int (*tcl_InputBuffered) (Tcl_Channel chan); /* 183 */
     int (*tcl_InterpDeleted) (Tcl_Interp * interp); /* 184 */
     int (*tcl_IsSafe) (Tcl_Interp * interp); /* 185 */
-    char * (*tcl_JoinPath) (int argc, CONST84 char * CONST * argv, Tcl_DString * resultPtr); /* 186 */
-    int (*tcl_LinkVar) (Tcl_Interp * interp, CONST char * varName, char * addr, int type); /* 187 */
+    char * (*tcl_JoinPath) (int argc, CONST84 char * const * argv, Tcl_DString * resultPtr); /* 186 */
+    int (*tcl_LinkVar) (Tcl_Interp * interp, const char * varName, char * addr, int type); /* 187 */
     void *reserved188;
     Tcl_Channel (*tcl_MakeFileChannel) (ClientData handle, int mode); /* 189 */
     int (*tcl_MakeSafe) (Tcl_Interp * interp); /* 190 */
     Tcl_Channel (*tcl_MakeTcpClientChannel) (ClientData tcpSocket); /* 191 */
-    char * (*tcl_Merge) (int argc, CONST84 char * CONST * argv); /* 192 */
+    char * (*tcl_Merge) (int argc, CONST84 char * const * argv); /* 192 */
     Tcl_HashEntry * (*tcl_NextHashEntry) (Tcl_HashSearch * searchPtr); /* 193 */
     void (*tcl_NotifyChannel) (Tcl_Channel channel, int mask); /* 194 */
     Tcl_Obj * (*tcl_ObjGetVar2) (Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, int flags); /* 195 */
@@ -3906,12 +3906,12 @@ typedef struct TclStubs {
 #ifdef MAC_OSX_TCL /* MACOSX */
     Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags); /* 197 */
 #endif /* MACOSX */
-    Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp * interp, CONST char * fileName, CONST char * modeString, int permissions); /* 198 */
-    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp * interp, int port, CONST char * address, CONST char * myaddr, int myport, int async); /* 199 */
-    Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp * interp, int port, CONST char * host, Tcl_TcpAcceptProc * acceptProc, ClientData callbackData); /* 200 */
+    Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp * interp, const char * fileName, const char * modeString, int permissions); /* 198 */
+    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp * interp, int port, const char * address, const char * myaddr, int myport, int async); /* 199 */
+    Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp * interp, int port, const char * host, Tcl_TcpAcceptProc * acceptProc, ClientData callbackData); /* 200 */
     void (*tcl_Preserve) (ClientData data); /* 201 */
     void (*tcl_PrintDouble) (Tcl_Interp * interp, double value, char * dst); /* 202 */
-    int (*tcl_PutEnv) (CONST char * assignment); /* 203 */
+    int (*tcl_PutEnv) (const char * assignment); /* 203 */
     CONST84_RETURN char * (*tcl_PosixError) (Tcl_Interp * interp); /* 204 */
     void (*tcl_QueueEvent) (Tcl_Event * evPtr, Tcl_QueuePosition position); /* 205 */
     int (*tcl_Read) (Tcl_Channel chan, char * bufPtr, int toRead); /* 206 */
@@ -3924,28 +3924,28 @@ typedef struct TclStubs {
 #ifdef MAC_OSX_TCL /* MACOSX */
     void (*tcl_ReapDetachedProcs) (void); /* 207 */
 #endif /* MACOSX */
-    int (*tcl_RecordAndEval) (Tcl_Interp * interp, CONST char * cmd, int flags); /* 208 */
+    int (*tcl_RecordAndEval) (Tcl_Interp * interp, const char * cmd, int flags); /* 208 */
     int (*tcl_RecordAndEvalObj) (Tcl_Interp * interp, Tcl_Obj * cmdPtr, int flags); /* 209 */
     void (*tcl_RegisterChannel) (Tcl_Interp * interp, Tcl_Channel chan); /* 210 */
-    void (*tcl_RegisterObjType) (CONST Tcl_ObjType * typePtr); /* 211 */
-    Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp * interp, CONST char * pattern); /* 212 */
-    int (*tcl_RegExpExec) (Tcl_Interp * interp, Tcl_RegExp regexp, CONST char * text, CONST char * start); /* 213 */
-    int (*tcl_RegExpMatch) (Tcl_Interp * interp, CONST char * text, CONST char * pattern); /* 214 */
+    void (*tcl_RegisterObjType) (const Tcl_ObjType * typePtr); /* 211 */
+    Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp * interp, const char * pattern); /* 212 */
+    int (*tcl_RegExpExec) (Tcl_Interp * interp, Tcl_RegExp regexp, const char * text, const char * start); /* 213 */
+    int (*tcl_RegExpMatch) (Tcl_Interp * interp, const char * text, const char * pattern); /* 214 */
     void (*tcl_RegExpRange) (Tcl_RegExp regexp, int index, CONST84 char ** startPtr, CONST84 char ** endPtr); /* 215 */
     void (*tcl_Release) (ClientData clientData); /* 216 */
     void (*tcl_ResetResult) (Tcl_Interp * interp); /* 217 */
-    int (*tcl_ScanElement) (CONST char * str, int * flagPtr); /* 218 */
-    int (*tcl_ScanCountedElement) (CONST char * str, int length, int * flagPtr); /* 219 */
+    int (*tcl_ScanElement) (const char * str, int * flagPtr); /* 218 */
+    int (*tcl_ScanCountedElement) (const char * str, int length, int * flagPtr); /* 219 */
     int (*tcl_SeekOld) (Tcl_Channel chan, int offset, int mode); /* 220 */
     int (*tcl_ServiceAll) (void); /* 221 */
     int (*tcl_ServiceEvent) (int flags); /* 222 */
-    void (*tcl_SetAssocData) (Tcl_Interp * interp, CONST char * name, Tcl_InterpDeleteProc * proc, ClientData clientData); /* 223 */
+    void (*tcl_SetAssocData) (Tcl_Interp * interp, const char * name, Tcl_InterpDeleteProc * proc, ClientData clientData); /* 223 */
     void (*tcl_SetChannelBufferSize) (Tcl_Channel chan, int sz); /* 224 */
-    int (*tcl_SetChannelOption) (Tcl_Interp * interp, Tcl_Channel chan, CONST char * optionName, CONST char * newValue); /* 225 */
-    int (*tcl_SetCommandInfo) (Tcl_Interp * interp, CONST char * cmdName, CONST Tcl_CmdInfo * infoPtr); /* 226 */
+    int (*tcl_SetChannelOption) (Tcl_Interp * interp, Tcl_Channel chan, const char * optionName, const char * newValue); /* 225 */
+    int (*tcl_SetCommandInfo) (Tcl_Interp * interp, const char * cmdName, const Tcl_CmdInfo * infoPtr); /* 226 */
     void (*tcl_SetErrno) (int err); /* 227 */
     void (*tcl_SetErrorCode) (Tcl_Interp * interp, ...); /* 228 */
-    void (*tcl_SetMaxBlockTime) (CONST Tcl_Time * timePtr); /* 229 */
+    void (*tcl_SetMaxBlockTime) (const Tcl_Time * timePtr); /* 229 */
     void (*tcl_SetPanicProc) (Tcl_PanicProc * panicProc); /* 230 */
     int (*tcl_SetRecursionLimit) (Tcl_Interp * interp, int depth); /* 231 */
     void (*tcl_SetResult) (Tcl_Interp * interp, char * result, Tcl_FreeProc * freeProc); /* 232 */
@@ -3953,112 +3953,112 @@ typedef struct TclStubs {
     void (*tcl_SetObjErrorCode) (Tcl_Interp * interp, Tcl_Obj * errorObjPtr); /* 234 */
     void (*tcl_SetObjResult) (Tcl_Interp * interp, Tcl_Obj * resultObjPtr); /* 235 */
     void (*tcl_SetStdChannel) (Tcl_Channel channel, int type); /* 236 */
-    CONST84_RETURN char * (*tcl_SetVar) (Tcl_Interp * interp, CONST char * varName, CONST char * newValue, int flags); /* 237 */
-    CONST84_RETURN char * (*tcl_SetVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, CONST char * newValue, int flags); /* 238 */
+    CONST84_RETURN char * (*tcl_SetVar) (Tcl_Interp * interp, const char * varName, const char * newValue, int flags); /* 237 */
+    CONST84_RETURN char * (*tcl_SetVar2) (Tcl_Interp * interp, const char * part1, const char * part2, const char * newValue, int flags); /* 238 */
     CONST84_RETURN char * (*tcl_SignalId) (int sig); /* 239 */
     CONST84_RETURN char * (*tcl_SignalMsg) (int sig); /* 240 */
     void (*tcl_SourceRCFile) (Tcl_Interp * interp); /* 241 */
-    int (*tcl_SplitList) (Tcl_Interp * interp, CONST char * listStr, int * argcPtr, CONST84 char *** argvPtr); /* 242 */
-    void (*tcl_SplitPath) (CONST char * path, int * argcPtr, CONST84 char *** argvPtr); /* 243 */
-    void (*tcl_StaticPackage) (Tcl_Interp * interp, CONST char * pkgName, Tcl_PackageInitProc * initProc, Tcl_PackageInitProc * safeInitProc); /* 244 */
-    int (*tcl_StringMatch) (CONST char * str, CONST char * pattern); /* 245 */
+    int (*tcl_SplitList) (Tcl_Interp * interp, const char * listStr, int * argcPtr, CONST84 char *** argvPtr); /* 242 */
+    void (*tcl_SplitPath) (const char * path, int * argcPtr, CONST84 char *** argvPtr); /* 243 */
+    void (*tcl_StaticPackage) (Tcl_Interp * interp, const char * pkgName, Tcl_PackageInitProc * initProc, Tcl_PackageInitProc * safeInitProc); /* 244 */
+    int (*tcl_StringMatch) (const char * str, const char * pattern); /* 245 */
     int (*tcl_TellOld) (Tcl_Channel chan); /* 246 */
-    int (*tcl_TraceVar) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 247 */
-    int (*tcl_TraceVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 248 */
-    char * (*tcl_TranslateFileName) (Tcl_Interp * interp, CONST char * name, Tcl_DString * bufferPtr); /* 249 */
-    int (*tcl_Ungets) (Tcl_Channel chan, CONST char * str, int len, int atHead); /* 250 */
-    void (*tcl_UnlinkVar) (Tcl_Interp * interp, CONST char * varName); /* 251 */
+    int (*tcl_TraceVar) (Tcl_Interp * interp, const char * varName, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 247 */
+    int (*tcl_TraceVar2) (Tcl_Interp * interp, const char * part1, const char * part2, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 248 */
+    char * (*tcl_TranslateFileName) (Tcl_Interp * interp, const char * name, Tcl_DString * bufferPtr); /* 249 */
+    int (*tcl_Ungets) (Tcl_Channel chan, const char * str, int len, int atHead); /* 250 */
+    void (*tcl_UnlinkVar) (Tcl_Interp * interp, const char * varName); /* 251 */
     int (*tcl_UnregisterChannel) (Tcl_Interp * interp, Tcl_Channel chan); /* 252 */
-    int (*tcl_UnsetVar) (Tcl_Interp * interp, CONST char * varName, int flags); /* 253 */
-    int (*tcl_UnsetVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags); /* 254 */
-    void (*tcl_UntraceVar) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 255 */
-    void (*tcl_UntraceVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 256 */
-    void (*tcl_UpdateLinkedVar) (Tcl_Interp * interp, CONST char * varName); /* 257 */
-    int (*tcl_UpVar) (Tcl_Interp * interp, CONST char * frameName, CONST char * varName, CONST char * localName, int flags); /* 258 */
-    int (*tcl_UpVar2) (Tcl_Interp * interp, CONST char * frameName, CONST char * part1, CONST char * part2, CONST char * localName, int flags); /* 259 */
+    int (*tcl_UnsetVar) (Tcl_Interp * interp, const char * varName, int flags); /* 253 */
+    int (*tcl_UnsetVar2) (Tcl_Interp * interp, const char * part1, const char * part2, int flags); /* 254 */
+    void (*tcl_UntraceVar) (Tcl_Interp * interp, const char * varName, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 255 */
+    void (*tcl_UntraceVar2) (Tcl_Interp * interp, const char * part1, const char * part2, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 256 */
+    void (*tcl_UpdateLinkedVar) (Tcl_Interp * interp, const char * varName); /* 257 */
+    int (*tcl_UpVar) (Tcl_Interp * interp, const char * frameName, const char * varName, const char * localName, int flags); /* 258 */
+    int (*tcl_UpVar2) (Tcl_Interp * interp, const char * frameName, const char * part1, const char * part2, const char * localName, int flags); /* 259 */
     int (*tcl_VarEval) (Tcl_Interp * interp, ...); /* 260 */
-    ClientData (*tcl_VarTraceInfo) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_VarTraceProc * procPtr, ClientData prevClientData); /* 261 */
-    ClientData (*tcl_VarTraceInfo2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags, Tcl_VarTraceProc * procPtr, ClientData prevClientData); /* 262 */
-    int (*tcl_Write) (Tcl_Channel chan, CONST char * s, int slen); /* 263 */
-    void (*tcl_WrongNumArgs) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], CONST char * message); /* 264 */
-    int (*tcl_DumpActiveMemory) (CONST char * fileName); /* 265 */
-    void (*tcl_ValidateAllMemory) (CONST char * file, int line); /* 266 */
+    ClientData (*tcl_VarTraceInfo) (Tcl_Interp * interp, const char * varName, int flags, Tcl_VarTraceProc * procPtr, ClientData prevClientData); /* 261 */
+    ClientData (*tcl_VarTraceInfo2) (Tcl_Interp * interp, const char * part1, const char * part2, int flags, Tcl_VarTraceProc * procPtr, ClientData prevClientData); /* 262 */
+    int (*tcl_Write) (Tcl_Channel chan, const char * s, int slen); /* 263 */
+    void (*tcl_WrongNumArgs) (Tcl_Interp * interp, int objc, Tcl_Obj *const objv[], const char * message); /* 264 */
+    int (*tcl_DumpActiveMemory) (const char * fileName); /* 265 */
+    void (*tcl_ValidateAllMemory) (const char * file, int line); /* 266 */
     void (*tcl_AppendResultVA) (Tcl_Interp * interp, va_list argList); /* 267 */
     void (*tcl_AppendStringsToObjVA) (Tcl_Obj * objPtr, va_list argList); /* 268 */
     CONST84_RETURN char * (*tcl_HashStats) (Tcl_HashTable * tablePtr); /* 269 */
-    CONST84_RETURN char * (*tcl_ParseVar) (Tcl_Interp * interp, CONST char * start, CONST84 char ** termPtr); /* 270 */
-    CONST84_RETURN char * (*tcl_PkgPresent) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact); /* 271 */
-    CONST84_RETURN char * (*tcl_PkgPresentEx) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact, ClientData * clientDataPtr); /* 272 */
-    int (*tcl_PkgProvide) (Tcl_Interp * interp, CONST char * name, CONST char * version); /* 273 */
-    CONST84_RETURN char * (*tcl_PkgRequire) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact); /* 274 */
+    CONST84_RETURN char * (*tcl_ParseVar) (Tcl_Interp * interp, const char * start, CONST84 char ** termPtr); /* 270 */
+    CONST84_RETURN char * (*tcl_PkgPresent) (Tcl_Interp * interp, const char * name, const char * version, int exact); /* 271 */
+    CONST84_RETURN char * (*tcl_PkgPresentEx) (Tcl_Interp * interp, const char * name, const char * version, int exact, ClientData * clientDataPtr); /* 272 */
+    int (*tcl_PkgProvide) (Tcl_Interp * interp, const char * name, const char * version); /* 273 */
+    CONST84_RETURN char * (*tcl_PkgRequire) (Tcl_Interp * interp, const char * name, const char * version, int exact); /* 274 */
     void (*tcl_SetErrorCodeVA) (Tcl_Interp * interp, va_list argList); /* 275 */
     int (*tcl_VarEvalVA) (Tcl_Interp * interp, va_list argList); /* 276 */
     Tcl_Pid (*tcl_WaitPid) (Tcl_Pid pid, int * statPtr, int options); /* 277 */
-    void (*tcl_PanicVA) (CONST char * format, va_list argList); /* 278 */
+    void (*tcl_PanicVA) (const char * format, va_list argList); /* 278 */
     void (*tcl_GetVersion) (int * major, int * minor, int * patchLevel, int * type); /* 279 */
     void (*tcl_InitMemory) (Tcl_Interp * interp); /* 280 */
-    Tcl_Channel (*tcl_StackChannel) (Tcl_Interp * interp, CONST Tcl_ChannelType * typePtr, ClientData instanceData, int mask, Tcl_Channel prevChan); /* 281 */
+    Tcl_Channel (*tcl_StackChannel) (Tcl_Interp * interp, const Tcl_ChannelType * typePtr, ClientData instanceData, int mask, Tcl_Channel prevChan); /* 281 */
     int (*tcl_UnstackChannel) (Tcl_Interp * interp, Tcl_Channel chan); /* 282 */
     Tcl_Channel (*tcl_GetStackedChannel) (Tcl_Channel chan); /* 283 */
     void (*tcl_SetMainLoop) (Tcl_MainLoopProc * proc); /* 284 */
     void *reserved285;
     void (*tcl_AppendObjToObj) (Tcl_Obj * objPtr, Tcl_Obj * appendObjPtr); /* 286 */
-    Tcl_Encoding (*tcl_CreateEncoding) (CONST Tcl_EncodingType * typePtr); /* 287 */
+    Tcl_Encoding (*tcl_CreateEncoding) (const Tcl_EncodingType * typePtr); /* 287 */
     void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc * proc, ClientData clientData); /* 288 */
     void (*tcl_DeleteThreadExitHandler) (Tcl_ExitProc * proc, ClientData clientData); /* 289 */
     void (*tcl_DiscardResult) (Tcl_SavedResult * statePtr); /* 290 */
-    int (*tcl_EvalEx) (Tcl_Interp * interp, CONST char * script, int numBytes, int flags); /* 291 */
-    int (*tcl_EvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 292 */
+    int (*tcl_EvalEx) (Tcl_Interp * interp, const char * script, int numBytes, int flags); /* 291 */
+    int (*tcl_EvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *const objv[], int flags); /* 292 */
     int (*tcl_EvalObjEx) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); /* 293 */
     void (*tcl_ExitThread) (int status); /* 294 */
-    int (*tcl_ExternalToUtf) (Tcl_Interp * interp, Tcl_Encoding encoding, CONST char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr); /* 295 */
-    char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr); /* 296 */
+    int (*tcl_ExternalToUtf) (Tcl_Interp * interp, Tcl_Encoding encoding, const char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr); /* 295 */
+    char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, const char * src, int srcLen, Tcl_DString * dsPtr); /* 296 */
     void (*tcl_FinalizeThread) (void); /* 297 */
     void (*tcl_FinalizeNotifier) (ClientData clientData); /* 298 */
     void (*tcl_FreeEncoding) (Tcl_Encoding encoding); /* 299 */
     Tcl_ThreadId (*tcl_GetCurrentThread) (void); /* 300 */
-    Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp * interp, CONST char * name); /* 301 */
+    Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp * interp, const char * name); /* 301 */
     CONST84_RETURN char * (*tcl_GetEncodingName) (Tcl_Encoding encoding); /* 302 */
     void (*tcl_GetEncodingNames) (Tcl_Interp * interp); /* 303 */
-    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp * interp, Tcl_Obj * objPtr, CONST VOID * tablePtr, int offset, CONST char * msg, int flags, int * indexPtr); /* 304 */
+    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp * interp, Tcl_Obj * objPtr, const VOID * tablePtr, int offset, const char * msg, int flags, int * indexPtr); /* 304 */
     VOID * (*tcl_GetThreadData) (Tcl_ThreadDataKey * keyPtr, int size); /* 305 */
-    Tcl_Obj * (*tcl_GetVar2Ex) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags); /* 306 */
+    Tcl_Obj * (*tcl_GetVar2Ex) (Tcl_Interp * interp, const char * part1, const char * part2, int flags); /* 306 */
     ClientData (*tcl_InitNotifier) (void); /* 307 */
     void (*tcl_MutexLock) (Tcl_Mutex * mutexPtr); /* 308 */
     void (*tcl_MutexUnlock) (Tcl_Mutex * mutexPtr); /* 309 */
     void (*tcl_ConditionNotify) (Tcl_Condition * condPtr); /* 310 */
-    void (*tcl_ConditionWait) (Tcl_Condition * condPtr, Tcl_Mutex * mutexPtr, CONST Tcl_Time * timePtr); /* 311 */
-    int (*tcl_NumUtfChars) (CONST char * src, int length); /* 312 */
+    void (*tcl_ConditionWait) (Tcl_Condition * condPtr, Tcl_Mutex * mutexPtr, const Tcl_Time * timePtr); /* 311 */
+    int (*tcl_NumUtfChars) (const char * src, int length); /* 312 */
     int (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj * objPtr, int charsToRead, int appendFlag); /* 313 */
     void (*tcl_RestoreResult) (Tcl_Interp * interp, Tcl_SavedResult * statePtr); /* 314 */
     void (*tcl_SaveResult) (Tcl_Interp * interp, Tcl_SavedResult * statePtr); /* 315 */
-    int (*tcl_SetSystemEncoding) (Tcl_Interp * interp, CONST char * name); /* 316 */
-    Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, Tcl_Obj * newValuePtr, int flags); /* 317 */
+    int (*tcl_SetSystemEncoding) (Tcl_Interp * interp, const char * name); /* 316 */
+    Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp * interp, const char * part1, const char * part2, Tcl_Obj * newValuePtr, int flags); /* 317 */
     void (*tcl_ThreadAlert) (Tcl_ThreadId threadId); /* 318 */
     void (*tcl_ThreadQueueEvent) (Tcl_ThreadId threadId, Tcl_Event* evPtr, Tcl_QueuePosition position); /* 319 */
-    Tcl_UniChar (*tcl_UniCharAtIndex) (CONST char * src, int index); /* 320 */
+    Tcl_UniChar (*tcl_UniCharAtIndex) (const char * src, int index); /* 320 */
     Tcl_UniChar (*tcl_UniCharToLower) (int ch); /* 321 */
     Tcl_UniChar (*tcl_UniCharToTitle) (int ch); /* 322 */
     Tcl_UniChar (*tcl_UniCharToUpper) (int ch); /* 323 */
     int (*tcl_UniCharToUtf) (int ch, char * buf); /* 324 */
-    CONST84_RETURN char * (*tcl_UtfAtIndex) (CONST char * src, int index); /* 325 */
-    int (*tcl_UtfCharComplete) (CONST char * src, int length); /* 326 */
-    int (*tcl_UtfBackslash) (CONST char * src, int * readPtr, char * dst); /* 327 */
-    CONST84_RETURN char * (*tcl_UtfFindFirst) (CONST char * src, int ch); /* 328 */
-    CONST84_RETURN char * (*tcl_UtfFindLast) (CONST char * src, int ch); /* 329 */
-    CONST84_RETURN char * (*tcl_UtfNext) (CONST char * src); /* 330 */
-    CONST84_RETURN char * (*tcl_UtfPrev) (CONST char * src, CONST char * start); /* 331 */
-    int (*tcl_UtfToExternal) (Tcl_Interp * interp, Tcl_Encoding encoding, CONST char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr); /* 332 */
-    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr); /* 333 */
+    CONST84_RETURN char * (*tcl_UtfAtIndex) (const char * src, int index); /* 325 */
+    int (*tcl_UtfCharComplete) (const char * src, int length); /* 326 */
+    int (*tcl_UtfBackslash) (const char * src, int * readPtr, char * dst); /* 327 */
+    CONST84_RETURN char * (*tcl_UtfFindFirst) (const char * src, int ch); /* 328 */
+    CONST84_RETURN char * (*tcl_UtfFindLast) (const char * src, int ch); /* 329 */
+    CONST84_RETURN char * (*tcl_UtfNext) (const char * src); /* 330 */
+    CONST84_RETURN char * (*tcl_UtfPrev) (const char * src, const char * start); /* 331 */
+    int (*tcl_UtfToExternal) (Tcl_Interp * interp, Tcl_Encoding encoding, const char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr); /* 332 */
+    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char * src, int srcLen, Tcl_DString * dsPtr); /* 333 */
     int (*tcl_UtfToLower) (char * src); /* 334 */
     int (*tcl_UtfToTitle) (char * src); /* 335 */
-    int (*tcl_UtfToUniChar) (CONST char * src, Tcl_UniChar * chPtr); /* 336 */
+    int (*tcl_UtfToUniChar) (const char * src, Tcl_UniChar * chPtr); /* 336 */
     int (*tcl_UtfToUpper) (char * src); /* 337 */
-    int (*tcl_WriteChars) (Tcl_Channel chan, CONST char * src, int srcLen); /* 338 */
+    int (*tcl_WriteChars) (Tcl_Channel chan, const char * src, int srcLen); /* 338 */
     int (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj * objPtr); /* 339 */
     char * (*tcl_GetString) (Tcl_Obj * objPtr); /* 340 */
     CONST84_RETURN char * (*tcl_GetDefaultEncodingDir) (void); /* 341 */
-    void (*tcl_SetDefaultEncodingDir) (CONST char * path); /* 342 */
+    void (*tcl_SetDefaultEncodingDir) (const char * path); /* 342 */
     void (*tcl_AlertNotifier) (ClientData clientData); /* 343 */
     void (*tcl_ServiceModeHook) (int mode); /* 344 */
     int (*tcl_UniCharIsAlnum) (int ch); /* 345 */
@@ -4068,91 +4068,91 @@ typedef struct TclStubs {
     int (*tcl_UniCharIsSpace) (int ch); /* 349 */
     int (*tcl_UniCharIsUpper) (int ch); /* 350 */
     int (*tcl_UniCharIsWordChar) (int ch); /* 351 */
-    int (*tcl_UniCharLen) (CONST Tcl_UniChar * uniStr); /* 352 */
-    int (*tcl_UniCharNcmp) (CONST Tcl_UniChar * ucs, CONST Tcl_UniChar * uct, unsigned long numChars); /* 353 */
-    char * (*tcl_UniCharToUtfDString) (CONST Tcl_UniChar * uniStr, int uniLength, Tcl_DString * dsPtr); /* 354 */
-    Tcl_UniChar * (*tcl_UtfToUniCharDString) (CONST char * src, int length, Tcl_DString * dsPtr); /* 355 */
+    int (*tcl_UniCharLen) (const Tcl_UniChar * uniStr); /* 352 */
+    int (*tcl_UniCharNcmp) (const Tcl_UniChar * ucs, const Tcl_UniChar * uct, unsigned long numChars); /* 353 */
+    char * (*tcl_UniCharToUtfDString) (const Tcl_UniChar * uniStr, int uniLength, Tcl_DString * dsPtr); /* 354 */
+    Tcl_UniChar * (*tcl_UtfToUniCharDString) (const char * src, int length, Tcl_DString * dsPtr); /* 355 */
     Tcl_RegExp (*tcl_GetRegExpFromObj) (Tcl_Interp * interp, Tcl_Obj * patObj, int flags); /* 356 */
     Tcl_Obj * (*tcl_EvalTokens) (Tcl_Interp * interp, Tcl_Token * tokenPtr, int count); /* 357 */
     void (*tcl_FreeParse) (Tcl_Parse * parsePtr); /* 358 */
-    void (*tcl_LogCommandInfo) (Tcl_Interp * interp, CONST char * script, CONST char * command, int length); /* 359 */
-    int (*tcl_ParseBraces) (Tcl_Interp * interp, CONST char * start, int numBytes, Tcl_Parse * parsePtr, int append, CONST84 char ** termPtr); /* 360 */
-    int (*tcl_ParseCommand) (Tcl_Interp * interp, CONST char * start, int numBytes, int nested, Tcl_Parse * parsePtr); /* 361 */
-    int (*tcl_ParseExpr) (Tcl_Interp * interp, CONST char * start, int numBytes, Tcl_Parse * parsePtr); /* 362 */
-    int (*tcl_ParseQuotedString) (Tcl_Interp * interp, CONST char * start, int numBytes, Tcl_Parse * parsePtr, int append, CONST84 char ** termPtr); /* 363 */
-    int (*tcl_ParseVarName) (Tcl_Interp * interp, CONST char * start, int numBytes, Tcl_Parse * parsePtr, int append); /* 364 */
+    void (*tcl_LogCommandInfo) (Tcl_Interp * interp, const char * script, const char * command, int length); /* 359 */
+    int (*tcl_ParseBraces) (Tcl_Interp * interp, const char * start, int numBytes, Tcl_Parse * parsePtr, int append, CONST84 char ** termPtr); /* 360 */
+    int (*tcl_ParseCommand) (Tcl_Interp * interp, const char * start, int numBytes, int nested, Tcl_Parse * parsePtr); /* 361 */
+    int (*tcl_ParseExpr) (Tcl_Interp * interp, const char * start, int numBytes, Tcl_Parse * parsePtr); /* 362 */
+    int (*tcl_ParseQuotedString) (Tcl_Interp * interp, const char * start, int numBytes, Tcl_Parse * parsePtr, int append, CONST84 char ** termPtr); /* 363 */
+    int (*tcl_ParseVarName) (Tcl_Interp * interp, const char * start, int numBytes, Tcl_Parse * parsePtr, int append); /* 364 */
     char * (*tcl_GetCwd) (Tcl_Interp * interp, Tcl_DString * cwdPtr); /* 365 */
-    int (*tcl_Chdir) (CONST char * dirName); /* 366 */
-    int (*tcl_Access) (CONST char * path, int mode); /* 367 */
-    int (*tcl_Stat) (CONST char * path, struct stat * bufPtr); /* 368 */
-    int (*tcl_UtfNcmp) (CONST char * s1, CONST char * s2, unsigned long n); /* 369 */
-    int (*tcl_UtfNcasecmp) (CONST char * s1, CONST char * s2, unsigned long n); /* 370 */
-    int (*tcl_StringCaseMatch) (CONST char * str, CONST char * pattern, int nocase); /* 371 */
+    int (*tcl_Chdir) (const char * dirName); /* 366 */
+    int (*tcl_Access) (const char * path, int mode); /* 367 */
+    int (*tcl_Stat) (const char * path, struct stat * bufPtr); /* 368 */
+    int (*tcl_UtfNcmp) (const char * s1, const char * s2, unsigned long n); /* 369 */
+    int (*tcl_UtfNcasecmp) (const char * s1, const char * s2, unsigned long n); /* 370 */
+    int (*tcl_StringCaseMatch) (const char * str, const char * pattern, int nocase); /* 371 */
     int (*tcl_UniCharIsControl) (int ch); /* 372 */
     int (*tcl_UniCharIsGraph) (int ch); /* 373 */
     int (*tcl_UniCharIsPrint) (int ch); /* 374 */
     int (*tcl_UniCharIsPunct) (int ch); /* 375 */
     int (*tcl_RegExpExecObj) (Tcl_Interp * interp, Tcl_RegExp regexp, Tcl_Obj * textObj, int offset, int nmatches, int flags); /* 376 */
     void (*tcl_RegExpGetInfo) (Tcl_RegExp regexp, Tcl_RegExpInfo * infoPtr); /* 377 */
-    Tcl_Obj * (*tcl_NewUnicodeObj) (CONST Tcl_UniChar * unicode, int numChars); /* 378 */
-    void (*tcl_SetUnicodeObj) (Tcl_Obj * objPtr, CONST Tcl_UniChar * unicode, int numChars); /* 379 */
+    Tcl_Obj * (*tcl_NewUnicodeObj) (const Tcl_UniChar * unicode, int numChars); /* 378 */
+    void (*tcl_SetUnicodeObj) (Tcl_Obj * objPtr, const Tcl_UniChar * unicode, int numChars); /* 379 */
     int (*tcl_GetCharLength) (Tcl_Obj * objPtr); /* 380 */
     Tcl_UniChar (*tcl_GetUniChar) (Tcl_Obj * objPtr, int index); /* 381 */
     Tcl_UniChar * (*tcl_GetUnicode) (Tcl_Obj * objPtr); /* 382 */
     Tcl_Obj * (*tcl_GetRange) (Tcl_Obj * objPtr, int first, int last); /* 383 */
-    void (*tcl_AppendUnicodeToObj) (Tcl_Obj * objPtr, CONST Tcl_UniChar * unicode, int length); /* 384 */
+    void (*tcl_AppendUnicodeToObj) (Tcl_Obj * objPtr, const Tcl_UniChar * unicode, int length); /* 384 */
     int (*tcl_RegExpMatchObj) (Tcl_Interp * interp, Tcl_Obj * textObj, Tcl_Obj * patternObj); /* 385 */
     void (*tcl_SetNotifier) (Tcl_NotifierProcs * notifierProcPtr); /* 386 */
     Tcl_Mutex * (*tcl_GetAllocMutex) (void); /* 387 */
     int (*tcl_GetChannelNames) (Tcl_Interp * interp); /* 388 */
-    int (*tcl_GetChannelNamesEx) (Tcl_Interp * interp, CONST char * pattern); /* 389 */
-    int (*tcl_ProcObjCmd) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); /* 390 */
+    int (*tcl_GetChannelNamesEx) (Tcl_Interp * interp, const char * pattern); /* 389 */
+    int (*tcl_ProcObjCmd) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *const objv[]); /* 390 */
     void (*tcl_ConditionFinalize) (Tcl_Condition * condPtr); /* 391 */
     void (*tcl_MutexFinalize) (Tcl_Mutex * mutex); /* 392 */
     int (*tcl_CreateThread) (Tcl_ThreadId * idPtr, Tcl_ThreadCreateProc proc, ClientData clientData, int stackSize, int flags); /* 393 */
     int (*tcl_ReadRaw) (Tcl_Channel chan, char * dst, int bytesToRead); /* 394 */
-    int (*tcl_WriteRaw) (Tcl_Channel chan, CONST char * src, int srcLen); /* 395 */
+    int (*tcl_WriteRaw) (Tcl_Channel chan, const char * src, int srcLen); /* 395 */
     Tcl_Channel (*tcl_GetTopChannel) (Tcl_Channel chan); /* 396 */
     int (*tcl_ChannelBuffered) (Tcl_Channel chan); /* 397 */
-    CONST84_RETURN char * (*tcl_ChannelName) (CONST Tcl_ChannelType * chanTypePtr); /* 398 */
-    Tcl_ChannelTypeVersion (*tcl_ChannelVersion) (CONST Tcl_ChannelType * chanTypePtr); /* 399 */
-    Tcl_DriverBlockModeProc * (*tcl_ChannelBlockModeProc) (CONST Tcl_ChannelType * chanTypePtr); /* 400 */
-    Tcl_DriverCloseProc * (*tcl_ChannelCloseProc) (CONST Tcl_ChannelType * chanTypePtr); /* 401 */
-    Tcl_DriverClose2Proc * (*tcl_ChannelClose2Proc) (CONST Tcl_ChannelType * chanTypePtr); /* 402 */
-    Tcl_DriverInputProc * (*tcl_ChannelInputProc) (CONST Tcl_ChannelType * chanTypePtr); /* 403 */
-    Tcl_DriverOutputProc * (*tcl_ChannelOutputProc) (CONST Tcl_ChannelType * chanTypePtr); /* 404 */
-    Tcl_DriverSeekProc * (*tcl_ChannelSeekProc) (CONST Tcl_ChannelType * chanTypePtr); /* 405 */
-    Tcl_DriverSetOptionProc * (*tcl_ChannelSetOptionProc) (CONST Tcl_ChannelType * chanTypePtr); /* 406 */
-    Tcl_DriverGetOptionProc * (*tcl_ChannelGetOptionProc) (CONST Tcl_ChannelType * chanTypePtr); /* 407 */
-    Tcl_DriverWatchProc * (*tcl_ChannelWatchProc) (CONST Tcl_ChannelType * chanTypePtr); /* 408 */
-    Tcl_DriverGetHandleProc * (*tcl_ChannelGetHandleProc) (CONST Tcl_ChannelType * chanTypePtr); /* 409 */
-    Tcl_DriverFlushProc * (*tcl_ChannelFlushProc) (CONST Tcl_ChannelType * chanTypePtr); /* 410 */
-    Tcl_DriverHandlerProc * (*tcl_ChannelHandlerProc) (CONST Tcl_ChannelType * chanTypePtr); /* 411 */
+    CONST84_RETURN char * (*tcl_ChannelName) (const Tcl_ChannelType * chanTypePtr); /* 398 */
+    Tcl_ChannelTypeVersion (*tcl_ChannelVersion) (const Tcl_ChannelType * chanTypePtr); /* 399 */
+    Tcl_DriverBlockModeProc * (*tcl_ChannelBlockModeProc) (const Tcl_ChannelType * chanTypePtr); /* 400 */
+    Tcl_DriverCloseProc * (*tcl_ChannelCloseProc) (const Tcl_ChannelType * chanTypePtr); /* 401 */
+    Tcl_DriverClose2Proc * (*tcl_ChannelClose2Proc) (const Tcl_ChannelType * chanTypePtr); /* 402 */
+    Tcl_DriverInputProc * (*tcl_ChannelInputProc) (const Tcl_ChannelType * chanTypePtr); /* 403 */
+    Tcl_DriverOutputProc * (*tcl_ChannelOutputProc) (const Tcl_ChannelType * chanTypePtr); /* 404 */
+    Tcl_DriverSeekProc * (*tcl_ChannelSeekProc) (const Tcl_ChannelType * chanTypePtr); /* 405 */
+    Tcl_DriverSetOptionProc * (*tcl_ChannelSetOptionProc) (const Tcl_ChannelType * chanTypePtr); /* 406 */
+    Tcl_DriverGetOptionProc * (*tcl_ChannelGetOptionProc) (const Tcl_ChannelType * chanTypePtr); /* 407 */
+    Tcl_DriverWatchProc * (*tcl_ChannelWatchProc) (const Tcl_ChannelType * chanTypePtr); /* 408 */
+    Tcl_DriverGetHandleProc * (*tcl_ChannelGetHandleProc) (const Tcl_ChannelType * chanTypePtr); /* 409 */
+    Tcl_DriverFlushProc * (*tcl_ChannelFlushProc) (const Tcl_ChannelType * chanTypePtr); /* 410 */
+    Tcl_DriverHandlerProc * (*tcl_ChannelHandlerProc) (const Tcl_ChannelType * chanTypePtr); /* 411 */
     int (*tcl_JoinThread) (Tcl_ThreadId threadId, int* result); /* 412 */
     int (*tcl_IsChannelShared) (Tcl_Channel channel); /* 413 */
     int (*tcl_IsChannelRegistered) (Tcl_Interp* interp, Tcl_Channel channel); /* 414 */
     void (*tcl_CutChannel) (Tcl_Channel channel); /* 415 */
     void (*tcl_SpliceChannel) (Tcl_Channel channel); /* 416 */
     void (*tcl_ClearChannelHandlers) (Tcl_Channel channel); /* 417 */
-    int (*tcl_IsChannelExisting) (CONST char* channelName); /* 418 */
-    int (*tcl_UniCharNcasecmp) (CONST Tcl_UniChar * ucs, CONST Tcl_UniChar * uct, unsigned long numChars); /* 419 */
-    int (*tcl_UniCharCaseMatch) (CONST Tcl_UniChar * uniStr, CONST Tcl_UniChar * uniPattern, int nocase); /* 420 */
-    Tcl_HashEntry * (*tcl_FindHashEntry) (Tcl_HashTable * tablePtr, CONST char * key); /* 421 */
-    Tcl_HashEntry * (*tcl_CreateHashEntry) (Tcl_HashTable * tablePtr, CONST char * key, int * newPtr); /* 422 */
-    void (*tcl_InitCustomHashTable) (Tcl_HashTable * tablePtr, int keyType, CONST Tcl_HashKeyType * typePtr); /* 423 */
+    int (*tcl_IsChannelExisting) (const char* channelName); /* 418 */
+    int (*tcl_UniCharNcasecmp) (const Tcl_UniChar * ucs, const Tcl_UniChar * uct, unsigned long numChars); /* 419 */
+    int (*tcl_UniCharCaseMatch) (const Tcl_UniChar * uniStr, const Tcl_UniChar * uniPattern, int nocase); /* 420 */
+    Tcl_HashEntry * (*tcl_FindHashEntry) (Tcl_HashTable * tablePtr, const char * key); /* 421 */
+    Tcl_HashEntry * (*tcl_CreateHashEntry) (Tcl_HashTable * tablePtr, const char * key, int * newPtr); /* 422 */
+    void (*tcl_InitCustomHashTable) (Tcl_HashTable * tablePtr, int keyType, const Tcl_HashKeyType * typePtr); /* 423 */
     void (*tcl_InitObjHashTable) (Tcl_HashTable * tablePtr); /* 424 */
-    ClientData (*tcl_CommandTraceInfo) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_CommandTraceProc * procPtr, ClientData prevClientData); /* 425 */
-    int (*tcl_TraceCommand) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_CommandTraceProc * proc, ClientData clientData); /* 426 */
-    void (*tcl_UntraceCommand) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_CommandTraceProc * proc, ClientData clientData); /* 427 */
+    ClientData (*tcl_CommandTraceInfo) (Tcl_Interp * interp, const char * varName, int flags, Tcl_CommandTraceProc * procPtr, ClientData prevClientData); /* 425 */
+    int (*tcl_TraceCommand) (Tcl_Interp * interp, const char * varName, int flags, Tcl_CommandTraceProc * proc, ClientData clientData); /* 426 */
+    void (*tcl_UntraceCommand) (Tcl_Interp * interp, const char * varName, int flags, Tcl_CommandTraceProc * proc, ClientData clientData); /* 427 */
     char * (*tcl_AttemptAlloc) (unsigned int size); /* 428 */
-    char * (*tcl_AttemptDbCkalloc) (unsigned int size, CONST char * file, int line); /* 429 */
+    char * (*tcl_AttemptDbCkalloc) (unsigned int size, const char * file, int line); /* 429 */
     char * (*tcl_AttemptRealloc) (char * ptr, unsigned int size); /* 430 */
-    char * (*tcl_AttemptDbCkrealloc) (char * ptr, unsigned int size, CONST char * file, int line); /* 431 */
+    char * (*tcl_AttemptDbCkrealloc) (char * ptr, unsigned int size, const char * file, int line); /* 431 */
     int (*tcl_AttemptSetObjLength) (Tcl_Obj * objPtr, int length); /* 432 */
     Tcl_ThreadId (*tcl_GetChannelThread) (Tcl_Channel channel); /* 433 */
     Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj * objPtr, int * lengthPtr); /* 434 */
-    int (*tcl_GetMathFuncInfo) (Tcl_Interp * interp, CONST char * name, int * numArgsPtr, Tcl_ValueType ** argTypesPtr, Tcl_MathProc ** procPtr, ClientData * clientDataPtr); /* 435 */
-    Tcl_Obj * (*tcl_ListMathFuncs) (Tcl_Interp * interp, CONST char * pattern); /* 436 */
+    int (*tcl_GetMathFuncInfo) (Tcl_Interp * interp, const char * name, int * numArgsPtr, Tcl_ValueType ** argTypesPtr, Tcl_MathProc ** procPtr, ClientData * clientDataPtr); /* 435 */
+    Tcl_Obj * (*tcl_ListMathFuncs) (Tcl_Interp * interp, const char * pattern); /* 436 */
     Tcl_Obj * (*tcl_SubstObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); /* 437 */
     int (*tcl_DetachChannel) (Tcl_Interp* interp, Tcl_Channel channel); /* 438 */
     int (*tcl_IsStandardChannel) (Tcl_Channel channel); /* 439 */
@@ -4160,8 +4160,8 @@ typedef struct TclStubs {
     int (*tcl_FSCopyDirectory) (Tcl_Obj * srcPathPtr, Tcl_Obj * destPathPtr, Tcl_Obj ** errorPtr); /* 441 */
     int (*tcl_FSCreateDirectory) (Tcl_Obj * pathPtr); /* 442 */
     int (*tcl_FSDeleteFile) (Tcl_Obj * pathPtr); /* 443 */
-    int (*tcl_FSLoadFile) (Tcl_Interp * interp, Tcl_Obj * pathPtr, CONST char * sym1, CONST char * sym2, Tcl_PackageInitProc ** proc1Ptr, Tcl_PackageInitProc ** proc2Ptr, Tcl_LoadHandle * handlePtr, Tcl_FSUnloadFileProc ** unloadProcPtr); /* 444 */
-    int (*tcl_FSMatchInDirectory) (Tcl_Interp * interp, Tcl_Obj * result, Tcl_Obj * pathPtr, CONST char * pattern, Tcl_GlobTypeData * types); /* 445 */
+    int (*tcl_FSLoadFile) (Tcl_Interp * interp, Tcl_Obj * pathPtr, const char * sym1, const char * sym2, Tcl_PackageInitProc ** proc1Ptr, Tcl_PackageInitProc ** proc2Ptr, Tcl_LoadHandle * handlePtr, Tcl_FSUnloadFileProc ** unloadProcPtr); /* 444 */
+    int (*tcl_FSMatchInDirectory) (Tcl_Interp * interp, Tcl_Obj * result, Tcl_Obj * pathPtr, const char * pattern, Tcl_GlobTypeData * types); /* 445 */
     Tcl_Obj * (*tcl_FSLink) (Tcl_Obj * pathPtr, Tcl_Obj * toPtr, int linkAction); /* 446 */
     int (*tcl_FSRemoveDirectory) (Tcl_Obj * pathPtr, int recursive, Tcl_Obj ** errorPtr); /* 447 */
     int (*tcl_FSRenameFile) (Tcl_Obj * srcPathPtr, Tcl_Obj * destPathPtr); /* 448 */
@@ -4169,10 +4169,10 @@ typedef struct TclStubs {
     int (*tcl_FSUtime) (Tcl_Obj * pathPtr, struct utimbuf * tval); /* 450 */
     int (*tcl_FSFileAttrsGet) (Tcl_Interp * interp, int index, Tcl_Obj * pathPtr, Tcl_Obj ** objPtrRef); /* 451 */
     int (*tcl_FSFileAttrsSet) (Tcl_Interp * interp, int index, Tcl_Obj * pathPtr, Tcl_Obj * objPtr); /* 452 */
-    CONST char *CONST86 * (*tcl_FSFileAttrStrings) (Tcl_Obj * pathPtr, Tcl_Obj ** objPtrRef); /* 453 */
+    const char *CONST86 * (*tcl_FSFileAttrStrings) (Tcl_Obj * pathPtr, Tcl_Obj ** objPtrRef); /* 453 */
     int (*tcl_FSStat) (Tcl_Obj * pathPtr, Tcl_StatBuf * buf); /* 454 */
     int (*tcl_FSAccess) (Tcl_Obj * pathPtr, int mode); /* 455 */
-    Tcl_Channel (*tcl_FSOpenFileChannel) (Tcl_Interp * interp, Tcl_Obj * pathPtr, CONST char * modeString, int permissions); /* 456 */
+    Tcl_Channel (*tcl_FSOpenFileChannel) (Tcl_Interp * interp, Tcl_Obj * pathPtr, const char * modeString, int permissions); /* 456 */
     Tcl_Obj* (*tcl_FSGetCwd) (Tcl_Interp * interp); /* 457 */
     int (*tcl_FSChdir) (Tcl_Obj * pathPtr); /* 458 */
     int (*tcl_FSConvertToPathType) (Tcl_Interp * interp, Tcl_Obj * pathPtr); /* 459 */
@@ -4180,36 +4180,36 @@ typedef struct TclStubs {
     Tcl_Obj* (*tcl_FSSplitPath) (Tcl_Obj* pathPtr, int * lenPtr); /* 461 */
     int (*tcl_FSEqualPaths) (Tcl_Obj* firstPtr, Tcl_Obj* secondPtr); /* 462 */
     Tcl_Obj* (*tcl_FSGetNormalizedPath) (Tcl_Interp * interp, Tcl_Obj* pathPtr); /* 463 */
-    Tcl_Obj* (*tcl_FSJoinToPath) (Tcl_Obj * pathPtr, int objc, Tcl_Obj *CONST objv[]); /* 464 */
-    ClientData (*tcl_FSGetInternalRep) (Tcl_Obj* pathPtr, CONST Tcl_Filesystem * fsPtr); /* 465 */
+    Tcl_Obj* (*tcl_FSJoinToPath) (Tcl_Obj * pathPtr, int objc, Tcl_Obj *const objv[]); /* 464 */
+    ClientData (*tcl_FSGetInternalRep) (Tcl_Obj* pathPtr, const Tcl_Filesystem * fsPtr); /* 465 */
     Tcl_Obj* (*tcl_FSGetTranslatedPath) (Tcl_Interp * interp, Tcl_Obj* pathPtr); /* 466 */
     int (*tcl_FSEvalFile) (Tcl_Interp * interp, Tcl_Obj * fileName); /* 467 */
-    Tcl_Obj* (*tcl_FSNewNativePath) (CONST Tcl_Filesystem* fromFilesystem, ClientData clientData); /* 468 */
-    CONST char* (*tcl_FSGetNativePath) (Tcl_Obj* pathPtr); /* 469 */
+    Tcl_Obj* (*tcl_FSNewNativePath) (const Tcl_Filesystem* fromFilesystem, ClientData clientData); /* 468 */
+    const char* (*tcl_FSGetNativePath) (Tcl_Obj* pathPtr); /* 469 */
     Tcl_Obj* (*tcl_FSFileSystemInfo) (Tcl_Obj* pathPtr); /* 470 */
     Tcl_Obj* (*tcl_FSPathSeparator) (Tcl_Obj* pathPtr); /* 471 */
     Tcl_Obj* (*tcl_FSListVolumes) (void); /* 472 */
-    int (*tcl_FSRegister) (ClientData clientData, CONST Tcl_Filesystem * fsPtr); /* 473 */
-    int (*tcl_FSUnregister) (CONST Tcl_Filesystem * fsPtr); /* 474 */
-    ClientData (*tcl_FSData) (CONST Tcl_Filesystem * fsPtr); /* 475 */
-    CONST char* (*tcl_FSGetTranslatedStringPath) (Tcl_Interp * interp, Tcl_Obj* pathPtr); /* 476 */
+    int (*tcl_FSRegister) (ClientData clientData, const Tcl_Filesystem * fsPtr); /* 473 */
+    int (*tcl_FSUnregister) (const Tcl_Filesystem * fsPtr); /* 474 */
+    ClientData (*tcl_FSData) (const Tcl_Filesystem * fsPtr); /* 475 */
+    const char* (*tcl_FSGetTranslatedStringPath) (Tcl_Interp * interp, Tcl_Obj* pathPtr); /* 476 */
     CONST86 Tcl_Filesystem* (*tcl_FSGetFileSystemForPath) (Tcl_Obj* pathPtr); /* 477 */
     Tcl_PathType (*tcl_FSGetPathType) (Tcl_Obj * pathPtr); /* 478 */
     int (*tcl_OutputBuffered) (Tcl_Channel chan); /* 479 */
-    void (*tcl_FSMountsChanged) (CONST Tcl_Filesystem * fsPtr); /* 480 */
+    void (*tcl_FSMountsChanged) (const Tcl_Filesystem * fsPtr); /* 480 */
     int (*tcl_EvalTokensStandard) (Tcl_Interp * interp, Tcl_Token * tokenPtr, int count); /* 481 */
     void (*tcl_GetTime) (Tcl_Time* timeBuf); /* 482 */
     Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp* interp, int level, int flags, Tcl_CmdObjTraceProc* objProc, ClientData clientData, Tcl_CmdObjTraceDeleteProc* delProc); /* 483 */
     int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo* infoPtr); /* 484 */
-    int (*tcl_SetCommandInfoFromToken) (Tcl_Command token, CONST Tcl_CmdInfo* infoPtr); /* 485 */
-    Tcl_Obj * (*tcl_DbNewWideIntObj) (Tcl_WideInt wideValue, CONST char * file, int line); /* 486 */
+    int (*tcl_SetCommandInfoFromToken) (Tcl_Command token, const Tcl_CmdInfo* infoPtr); /* 485 */
+    Tcl_Obj * (*tcl_DbNewWideIntObj) (Tcl_WideInt wideValue, const char * file, int line); /* 486 */
     int (*tcl_GetWideIntFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, Tcl_WideInt * widePtr); /* 487 */
     Tcl_Obj * (*tcl_NewWideIntObj) (Tcl_WideInt wideValue); /* 488 */
     void (*tcl_SetWideIntObj) (Tcl_Obj * objPtr, Tcl_WideInt wideValue); /* 489 */
     Tcl_StatBuf * (*tcl_AllocStatBuf) (void); /* 490 */
     Tcl_WideInt (*tcl_Seek) (Tcl_Channel chan, Tcl_WideInt offset, int mode); /* 491 */
     Tcl_WideInt (*tcl_Tell) (Tcl_Channel chan); /* 492 */
-    Tcl_DriverWideSeekProc * (*tcl_ChannelWideSeekProc) (CONST Tcl_ChannelType * chanTypePtr); /* 493 */
+    Tcl_DriverWideSeekProc * (*tcl_ChannelWideSeekProc) (const Tcl_ChannelType * chanTypePtr); /* 493 */
     int (*tcl_DictObjPut) (Tcl_Interp * interp, Tcl_Obj * dictPtr, Tcl_Obj * keyPtr, Tcl_Obj * valuePtr); /* 494 */
     int (*tcl_DictObjGet) (Tcl_Interp * interp, Tcl_Obj * dictPtr, Tcl_Obj * keyPtr, Tcl_Obj ** valuePtrPtr); /* 495 */
     int (*tcl_DictObjRemove) (Tcl_Interp * interp, Tcl_Obj * dictPtr, Tcl_Obj * keyPtr); /* 496 */
@@ -4217,24 +4217,24 @@ typedef struct TclStubs {
     int (*tcl_DictObjFirst) (Tcl_Interp * interp, Tcl_Obj * dictPtr, Tcl_DictSearch * searchPtr, Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr, int * donePtr); /* 498 */
     void (*tcl_DictObjNext) (Tcl_DictSearch * searchPtr, Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr, int * donePtr); /* 499 */
     void (*tcl_DictObjDone) (Tcl_DictSearch * searchPtr); /* 500 */
-    int (*tcl_DictObjPutKeyList) (Tcl_Interp * interp, Tcl_Obj * dictPtr, int keyc, Tcl_Obj *CONST * keyv, Tcl_Obj * valuePtr); /* 501 */
-    int (*tcl_DictObjRemoveKeyList) (Tcl_Interp * interp, Tcl_Obj * dictPtr, int keyc, Tcl_Obj *CONST * keyv); /* 502 */
+    int (*tcl_DictObjPutKeyList) (Tcl_Interp * interp, Tcl_Obj * dictPtr, int keyc, Tcl_Obj *const * keyv, Tcl_Obj * valuePtr); /* 501 */
+    int (*tcl_DictObjRemoveKeyList) (Tcl_Interp * interp, Tcl_Obj * dictPtr, int keyc, Tcl_Obj *const * keyv); /* 502 */
     Tcl_Obj * (*tcl_NewDictObj) (void); /* 503 */
-    Tcl_Obj * (*tcl_DbNewDictObj) (CONST char * file, int line); /* 504 */
-    void (*tcl_RegisterConfig) (Tcl_Interp* interp, CONST char* pkgName, CONST Tcl_Config* configuration, CONST char* valEncoding); /* 505 */
-    Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp * interp, CONST char * name, ClientData clientData, Tcl_NamespaceDeleteProc * deleteProc); /* 506 */
+    Tcl_Obj * (*tcl_DbNewDictObj) (const char * file, int line); /* 504 */
+    void (*tcl_RegisterConfig) (Tcl_Interp* interp, const char* pkgName, const Tcl_Config* configuration, const char* valEncoding); /* 505 */
+    Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp * interp, const char * name, ClientData clientData, Tcl_NamespaceDeleteProc * deleteProc); /* 506 */
     void (*tcl_DeleteNamespace) (Tcl_Namespace * nsPtr); /* 507 */
     int (*tcl_AppendExportList) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, Tcl_Obj * objPtr); /* 508 */
-    int (*tcl_Export) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern, int resetListFirst); /* 509 */
-    int (*tcl_Import) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern, int allowOverwrite); /* 510 */
-    int (*tcl_ForgetImport) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern); /* 511 */
+    int (*tcl_Export) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, const char * pattern, int resetListFirst); /* 509 */
+    int (*tcl_Import) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, const char * pattern, int allowOverwrite); /* 510 */
+    int (*tcl_ForgetImport) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, const char * pattern); /* 511 */
     Tcl_Namespace * (*tcl_GetCurrentNamespace) (Tcl_Interp * interp); /* 512 */
     Tcl_Namespace * (*tcl_GetGlobalNamespace) (Tcl_Interp * interp); /* 513 */
-    Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags); /* 514 */
-    Tcl_Command (*tcl_FindCommand) (Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags); /* 515 */
+    Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp * interp, const char * name, Tcl_Namespace * contextNsPtr, int flags); /* 514 */
+    Tcl_Command (*tcl_FindCommand) (Tcl_Interp * interp, const char * name, Tcl_Namespace * contextNsPtr, int flags); /* 515 */
     Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 516 */
     void (*tcl_GetCommandFullName) (Tcl_Interp * interp, Tcl_Command command, Tcl_Obj * objPtr); /* 517 */
-    int (*tcl_FSEvalFileEx) (Tcl_Interp * interp, Tcl_Obj * fileName, CONST char * encodingName); /* 518 */
+    int (*tcl_FSEvalFileEx) (Tcl_Interp * interp, Tcl_Obj * fileName, const char * encodingName); /* 518 */
     Tcl_ExitProc * (*tcl_SetExitProc) (Tcl_ExitProc * proc); /* 519 */
     void (*tcl_LimitAddHandler) (Tcl_Interp * interp, int type, Tcl_LimitHandlerProc * handlerProc, ClientData clientData, Tcl_LimitHandlerDeleteProc * deleteProc); /* 520 */
     void (*tcl_LimitRemoveHandler) (Tcl_Interp * interp, int type, Tcl_LimitHandlerProc * handlerProc, ClientData clientData); /* 521 */
@@ -4257,7 +4257,7 @@ typedef struct TclStubs {
     int (*tcl_SetReturnOptions) (Tcl_Interp * interp, Tcl_Obj * options); /* 538 */
     Tcl_Obj * (*tcl_GetReturnOptions) (Tcl_Interp * interp, int result); /* 539 */
     int (*tcl_IsEnsemble) (Tcl_Command token); /* 540 */
-    Tcl_Command (*tcl_CreateEnsemble) (Tcl_Interp * interp, CONST char * name, Tcl_Namespace * namespacePtr, int flags); /* 541 */
+    Tcl_Command (*tcl_CreateEnsemble) (Tcl_Interp * interp, const char * name, Tcl_Namespace * namespacePtr, int flags); /* 541 */
     Tcl_Command (*tcl_FindEnsemble) (Tcl_Interp * interp, Tcl_Obj * cmdNameObj, int flags); /* 542 */
     int (*tcl_SetEnsembleSubcommandList) (Tcl_Interp * interp, Tcl_Command token, Tcl_Obj * subcmdList); /* 543 */
     int (*tcl_SetEnsembleMappingDict) (Tcl_Interp * interp, Tcl_Command token, Tcl_Obj * mapDict); /* 544 */
@@ -4270,14 +4270,14 @@ typedef struct TclStubs {
     int (*tcl_GetEnsembleNamespace) (Tcl_Interp * interp, Tcl_Command token, Tcl_Namespace ** namespacePtrPtr); /* 551 */
     void (*tcl_SetTimeProc) (Tcl_GetTimeProc* getProc, Tcl_ScaleTimeProc* scaleProc, ClientData clientData); /* 552 */
     void (*tcl_QueryTimeProc) (Tcl_GetTimeProc** getProc, Tcl_ScaleTimeProc** scaleProc, ClientData* clientData); /* 553 */
-    Tcl_DriverThreadActionProc * (*tcl_ChannelThreadActionProc) (CONST Tcl_ChannelType * chanTypePtr); /* 554 */
+    Tcl_DriverThreadActionProc * (*tcl_ChannelThreadActionProc) (const Tcl_ChannelType * chanTypePtr); /* 554 */
     Tcl_Obj* (*tcl_NewBignumObj) (mp_int* value); /* 555 */
-    Tcl_Obj* (*tcl_DbNewBignumObj) (mp_int* value, CONST char* file, int line); /* 556 */
+    Tcl_Obj* (*tcl_DbNewBignumObj) (mp_int* value, const char* file, int line); /* 556 */
     void (*tcl_SetBignumObj) (Tcl_Obj* obj, mp_int* value); /* 557 */
     int (*tcl_GetBignumFromObj) (Tcl_Interp* interp, Tcl_Obj* obj, mp_int* value); /* 558 */
     int (*tcl_TakeBignumFromObj) (Tcl_Interp* interp, Tcl_Obj* obj, mp_int* value); /* 559 */
     int (*tcl_TruncateChannel) (Tcl_Channel chan, Tcl_WideInt length); /* 560 */
-    Tcl_DriverTruncateProc * (*tcl_ChannelTruncateProc) (CONST Tcl_ChannelType * chanTypePtr); /* 561 */
+    Tcl_DriverTruncateProc * (*tcl_ChannelTruncateProc) (const Tcl_ChannelType * chanTypePtr); /* 561 */
     void (*tcl_SetChannelErrorInterp) (Tcl_Interp* interp, Tcl_Obj* msg); /* 562 */
     void (*tcl_GetChannelErrorInterp) (Tcl_Interp* interp, Tcl_Obj** msg); /* 563 */
     void (*tcl_SetChannelError) (Tcl_Channel chan, Tcl_Obj* msg); /* 564 */
@@ -4288,23 +4288,23 @@ typedef struct TclStubs {
     int (*tcl_GetEncodingFromObj) (Tcl_Interp* interp, Tcl_Obj* objPtr, Tcl_Encoding* encodingPtr); /* 569 */
     Tcl_Obj* (*tcl_GetEncodingSearchPath) (void); /* 570 */
     int (*tcl_SetEncodingSearchPath) (Tcl_Obj* searchPath); /* 571 */
-    CONST char * (*tcl_GetEncodingNameFromEnvironment) (Tcl_DString* bufPtr); /* 572 */
-    int (*tcl_PkgRequireProc) (Tcl_Interp * interp, CONST char * name, int objc, Tcl_Obj *CONST objv[], ClientData * clientDataPtr); /* 573 */
+    const char * (*tcl_GetEncodingNameFromEnvironment) (Tcl_DString* bufPtr); /* 572 */
+    int (*tcl_PkgRequireProc) (Tcl_Interp * interp, const char * name, int objc, Tcl_Obj *const objv[], ClientData * clientDataPtr); /* 573 */
     void (*tcl_AppendObjToErrorInfo) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 574 */
-    void (*tcl_AppendLimitedToObj) (Tcl_Obj * objPtr, CONST char * bytes, int length, int limit, CONST char * ellipsis); /* 575 */
-    Tcl_Obj * (*tcl_Format) (Tcl_Interp * interp, CONST char * format, int objc, Tcl_Obj * CONST objv[]); /* 576 */
-    int (*tcl_AppendFormatToObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, CONST char * format, int objc, Tcl_Obj * CONST objv[]); /* 577 */
-    Tcl_Obj * (*tcl_ObjPrintf) (CONST char * format, ...); /* 578 */
-    void (*tcl_AppendPrintfToObj) (Tcl_Obj * objPtr, CONST char * format, ...); /* 579 */
+    void (*tcl_AppendLimitedToObj) (Tcl_Obj * objPtr, const char * bytes, int length, int limit, const char * ellipsis); /* 575 */
+    Tcl_Obj * (*tcl_Format) (Tcl_Interp * interp, const char * format, int objc, Tcl_Obj * const objv[]); /* 576 */
+    int (*tcl_AppendFormatToObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, const char * format, int objc, Tcl_Obj * const objv[]); /* 577 */
+    Tcl_Obj * (*tcl_ObjPrintf) (const char * format, ...); /* 578 */
+    void (*tcl_AppendPrintfToObj) (Tcl_Obj * objPtr, const char * format, ...); /* 579 */
     int (*tcl_CancelEval) (Tcl_Interp * interp, Tcl_Obj * resultObjPtr, ClientData clientData, int flags); /* 580 */
     int (*tcl_Canceled) (Tcl_Interp * interp, int flags); /* 581 */
     int (*tcl_CreatePipe) (Tcl_Interp * interp, Tcl_Channel * rchan, Tcl_Channel * wchan, int flags); /* 582 */
-    Tcl_Command (*tcl_NRCreateCommand) (Tcl_Interp * interp, CONST char * cmdName, Tcl_ObjCmdProc * proc, Tcl_ObjCmdProc * nreProc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 583 */
+    Tcl_Command (*tcl_NRCreateCommand) (Tcl_Interp * interp, const char * cmdName, Tcl_ObjCmdProc * proc, Tcl_ObjCmdProc * nreProc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 583 */
     int (*tcl_NREvalObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); /* 584 */
-    int (*tcl_NREvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 585 */
-    int (*tcl_NRCmdSwap) (Tcl_Interp * interp, Tcl_Command cmd, int objc, Tcl_Obj *CONST objv[], int flags); /* 586 */
+    int (*tcl_NREvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *const objv[], int flags); /* 585 */
+    int (*tcl_NRCmdSwap) (Tcl_Interp * interp, Tcl_Command cmd, int objc, Tcl_Obj *const objv[], int flags); /* 586 */
     void (*tcl_NRAddCallback) (Tcl_Interp * interp, Tcl_NRPostProc * postProcPtr, ClientData data0, ClientData data1, ClientData data2, ClientData data3); /* 587 */
-    int (*tcl_NRCallObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData, int objc, Tcl_Obj *CONST objv[]); /* 588 */
+    int (*tcl_NRCallObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData, int objc, Tcl_Obj *const objv[]); /* 588 */
     unsigned (*tcl_GetFSDeviceFromStat) (const Tcl_StatBuf * statPtr); /* 589 */
     unsigned (*tcl_GetFSInodeFromStat) (const Tcl_StatBuf * statPtr); /* 590 */
     unsigned (*tcl_GetModeFromStat) (const Tcl_StatBuf * statPtr); /* 591 */
@@ -4324,7 +4324,7 @@ typedef struct TclStubs {
 } TclStubs;
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-extern CONST TclStubs *tclStubsPtr;
+extern const TclStubs *tclStubsPtr;
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index a1b43cb..7378e49 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclEncoding.c,v 1.62 2008/10/16 22:34:19 nijtmans Exp $
+ * RCS: @(#) $Id: tclEncoding.c,v 1.63 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -1670,7 +1670,7 @@ LoadTableEncoding(
      * sequences in the encoding files.
      */
 
-    static char staticHex[] = {
+    static const char staticHex[] = {
       0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*   0 ...  15 */
       0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*  16 ...  31 */
       0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*  32 ...  47 */
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 3dfdfb7..221fb34 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -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.decls,v 1.128 2008/10/05 20:47:52 nijtmans Exp $
+# RCS: @(#) $Id: tclInt.decls,v 1.129 2008/10/22 20:23:59 nijtmans Exp $
 
 library tcl
 
@@ -28,7 +28,7 @@ interface tclInt
 
 # Replaced by Tcl_FSAccess in 8.4:
 #declare 0 generic {
-#    int TclAccess(CONST char *path, int mode)
+#    int TclAccess(const char *path, int mode)
 #}
 #declare 1 generic {
 #    int TclAccessDeleteProc(TclAccessProc_ *proc)
@@ -51,7 +51,7 @@ declare 6 generic {
     void TclCleanupCommand(Command *cmdPtr)
 }
 declare 7 generic {
-    int TclCopyAndCollapse(int count, CONST char *src, char *dst)
+    int TclCopyAndCollapse(int count, const char *src, char *dst)
 }
 declare 8 generic {
     int TclCopyChannel(Tcl_Interp *interp, Tcl_Channel inChan,
@@ -61,13 +61,13 @@ declare 8 generic {
 # TclCreatePipeline unofficially exported for use by BLT.
 
 declare 9 {unix win} {
-    int TclCreatePipeline(Tcl_Interp *interp, int argc, CONST char **argv,
+    int TclCreatePipeline(Tcl_Interp *interp, int argc, const char **argv,
 	    Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr,
 	    TclFile *errFilePtr)
 }
 declare 10 generic {
     int TclCreateProc(Tcl_Interp *interp, Namespace *nsPtr,
-	    CONST char *procName,
+	    const char *procName,
 	    Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Proc **procPtrPtr)
 }
 declare 11 generic {
@@ -93,7 +93,7 @@ declare 16 generic {
 }
 # Removed in 8.4
 #declare 17 generic {
-#    int TclFileAttrsCmd(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+#    int TclFileAttrsCmd(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 #}
 #declare 18 generic {
 #    int TclFileCopyCmd(Tcl_Interp *interp, int argc, char **argv)
@@ -108,12 +108,12 @@ declare 16 generic {
 #    int TclFileRenameCmd(Tcl_Interp *interp, int argc, char **argv)
 #}
 declare 22 generic {
-    int TclFindElement(Tcl_Interp *interp, CONST char *listStr,
-	    int listLength, CONST char **elementPtr, CONST char **nextPtr,
+    int TclFindElement(Tcl_Interp *interp, const char *listStr,
+	    int listLength, const char **elementPtr, const char **nextPtr,
 	    int *sizePtr, int *bracePtr)
 }
 declare 23 generic {
-    Proc *TclFindProc(Interp *iPtr, CONST char *procName)
+    Proc *TclFindProc(Interp *iPtr, const char *procName)
 }
 # Replaced with macro (see tclInt.h) in Tcl 8.5
 #declare 24 generic {
@@ -139,15 +139,15 @@ declare 28 generic {
 #    Tcl_Obj *TclGetElementOfIndexedArray(Tcl_Interp *interp,
 #	    int localIndex, Tcl_Obj *elemPtr, int flags)
 #}
-# Replaced by char *TclGetEnv(CONST char *name, Tcl_DString *valuePtr) in 8.1:
+# Replaced by char *TclGetEnv(const char *name, Tcl_DString *valuePtr) in 8.1:
 #  declare 30 generic {
-#      char *TclGetEnv(CONST char *name)
+#      char *TclGetEnv(const char *name)
 #  }
 declare 31 generic {
-    CONST char *TclGetExtension(CONST char *name)
+    const char *TclGetExtension(const char *name)
 }
 declare 32 generic {
-    int TclGetFrame(Tcl_Interp *interp, CONST char *str,
+    int TclGetFrame(Tcl_Interp *interp, const char *str,
 	    CallFrame **framePtrPtr)
 }
 # Removed in Tcl 8.5
@@ -165,28 +165,28 @@ declare 34 generic {
 #}
 # Removed in 8.6a2
 #declare 36 generic {
-#    int TclGetLong(Tcl_Interp *interp, CONST char *str, long *longPtr)
+#    int TclGetLong(Tcl_Interp *interp, const char *str, long *longPtr)
 #}
 declare 37 generic {
     int TclGetLoadedPackages(Tcl_Interp *interp, char *targetName)
 }
 declare 38 generic {
-    int TclGetNamespaceForQualName(Tcl_Interp *interp, CONST char *qualName,
+    int TclGetNamespaceForQualName(Tcl_Interp *interp, const char *qualName,
 	    Namespace *cxtNsPtr, int flags, Namespace **nsPtrPtr,
 	    Namespace **altNsPtrPtr, Namespace **actualCxtPtrPtr,
-	    CONST char **simpleNamePtr)
+	    const char **simpleNamePtr)
 }
 declare 39 generic {
     TclObjCmdProcType TclGetObjInterpProc(void)
 }
 declare 40 generic {
-    int TclGetOpenMode(Tcl_Interp *interp, CONST char *str, int *seekFlagPtr)
+    int TclGetOpenMode(Tcl_Interp *interp, const char *str, int *seekFlagPtr)
 }
 declare 41 generic {
     Tcl_Command TclGetOriginalCommand(Tcl_Command command)
 }
 declare 42 generic {
-    char *TclpGetUserHome(CONST char *name, Tcl_DString *bufferPtr)
+    char *TclpGetUserHome(const char *name, Tcl_DString *bufferPtr)
 }
 # Removed in Tcl 8.5a2
 #declare 43 generic {
@@ -194,7 +194,7 @@ declare 42 generic {
 #	    int flags)
 #}
 declare 44 generic {
-    int TclGuessPackageName(CONST char *fileName, Tcl_DString *bufPtr)
+    int TclGuessPackageName(const char *fileName, Tcl_DString *bufPtr)
 }
 declare 45 generic {
     int TclHideUnsafeCommands(Tcl_Interp *interp)
@@ -234,7 +234,7 @@ declare 53 generic {
 }
 declare 54 generic {
     int TclInvokeStringCommand(ClientData clientData, Tcl_Interp *interp,
-	    int objc, Tcl_Obj *CONST objv[])
+	    int objc, Tcl_Obj *const objv[])
 }
 declare 55 generic {
     Proc *TclIsProc(Command *cmdPtr)
@@ -250,8 +250,8 @@ declare 55 generic {
 #      int TclLooksLikeInt(char *p)
 #  }
 declare 58 generic {
-    Var *TclLookupVar(Tcl_Interp *interp, CONST char *part1, CONST char *part2,
-	    int flags, CONST char *msg, int createPart1, int createPart2,
+    Var *TclLookupVar(Tcl_Interp *interp, const char *part1, const char *part2,
+	    int flags, const char *msg, int createPart1, int createPart2,
 	    Var **arrayPtrPtr)
 }
 # Replaced by Tcl_FSMatchInDirectory in 8.4
@@ -260,7 +260,7 @@ declare 58 generic {
 #	    Tcl_DString *dirPtr, char *pattern, char *tail)
 #}
 declare 60 generic {
-    int TclNeedSpace(CONST char *start, CONST char *end)
+    int TclNeedSpace(const char *start, const char *end)
 }
 declare 61 generic {
     Tcl_Obj *TclNewProcBodyObj(Proc *procPtr)
@@ -270,16 +270,16 @@ declare 62 generic {
 }
 declare 63 generic {
     int TclObjInterpProc(ClientData clientData, Tcl_Interp *interp,
-	    int objc, Tcl_Obj *CONST objv[])
+	    int objc, Tcl_Obj *const objv[])
 }
 declare 64 generic {
-    int TclObjInvoke(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
+    int TclObjInvoke(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
 	    int flags)
 }
 # Removed in Tcl 8.5a2
 #declare 65 generic {
 #    int TclObjInvokeGlobal(Tcl_Interp *interp, int objc,
-#	    Tcl_Obj *CONST objv[], int flags)
+#	    Tcl_Obj *const objv[], int flags)
 #}
 #declare 66 generic {
 #    int TclOpenFileChannelDeleteProc(TclOpenFileChannelProc_ *proc)
@@ -289,23 +289,23 @@ declare 64 generic {
 #}
 # Replaced by Tcl_FSAccess in 8.4:
 #declare 68 generic {
-#    int TclpAccess(CONST char *path, int mode)
+#    int TclpAccess(const char *path, int mode)
 #}
 declare 69 generic {
     char *TclpAlloc(unsigned int size)
 }
 #declare 70 generic {
-#    int TclpCopyFile(CONST char *source, CONST char *dest)
+#    int TclpCopyFile(const char *source, const char *dest)
 #}
 #declare 71 generic {
-#    int TclpCopyDirectory(CONST char *source, CONST char *dest,
+#    int TclpCopyDirectory(const char *source, const char *dest,
 #	    Tcl_DString *errorPtr)
 #}
 #declare 72 generic {
-#    int TclpCreateDirectory(CONST char *path)
+#    int TclpCreateDirectory(const char *path)
 #}
 #declare 73 generic {
-#    int TclpDeleteFile(CONST char *path)
+#    int TclpDeleteFile(const char *path)
 #}
 declare 74 generic {
     void TclpFree(char *ptr)
@@ -337,11 +337,11 @@ declare 81 generic {
     char *TclpRealloc(char *ptr, unsigned int size)
 }
 #declare 82 generic {
-#    int TclpRemoveDirectory(CONST char *path, int recursive,
+#    int TclpRemoveDirectory(const char *path, int recursive,
 #	    Tcl_DString *errorPtr)
 #}
 #declare 83 generic {
-#    int TclpRenameFile(CONST char *source, CONST char *dest)
+#    int TclpRenameFile(const char *source, const char *dest)
 #}
 # Removed in 8.1:
 #  declare 84 generic {
@@ -361,7 +361,7 @@ declare 81 generic {
 #  }
 declare 88 generic {
     char *TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp,
-	    CONST char *name1, CONST char *name2, int flags)
+	    const char *name1, const char *name2, int flags)
 }
 declare 89 generic {
     int TclPreventAliasLoop(Tcl_Interp *interp, Tcl_Interp *cmdInterp,
@@ -376,8 +376,8 @@ declare 91 generic {
 }
 declare 92 generic {
     int TclProcCompileProc(Tcl_Interp *interp, Proc *procPtr,
-	    Tcl_Obj *bodyPtr, Namespace *nsPtr, CONST char *description,
-	    CONST char *procName)
+	    Tcl_Obj *bodyPtr, Namespace *nsPtr, const char *description,
+	    const char *procName)
 }
 declare 93 generic {
     void TclProcDeleteProc(ClientData clientData)
@@ -389,11 +389,11 @@ declare 93 generic {
 #}
 # Replaced by Tcl_FSStat in 8.4:
 #declare 95 generic {
-#    int TclpStat(CONST char *path, Tcl_StatBuf *buf)
+#    int TclpStat(const char *path, Tcl_StatBuf *buf)
 #}
 declare 96 generic {
-    int TclRenameCommand(Tcl_Interp *interp, CONST char *oldName,
-            CONST char *newName)
+    int TclRenameCommand(Tcl_Interp *interp, const char *oldName,
+            const char *newName)
 }
 declare 97 generic {
     void TclResetShadowedCmdRefs(Tcl_Interp *interp, Command *newCmdPtr)
@@ -418,7 +418,7 @@ declare 102 generic {
     void TclSetupEnv(Tcl_Interp *interp)
 }
 declare 103 generic {
-    int TclSockGetPort(Tcl_Interp *interp, CONST char *str, CONST char *proto,
+    int TclSockGetPort(Tcl_Interp *interp, const char *str, const char *proto,
 	    int *portPtr)
 }
 declare 104 {unix win} {
@@ -426,7 +426,7 @@ declare 104 {unix win} {
 }
 # Replaced by Tcl_FSStat in 8.4:
 #declare 105 generic {
-#    int TclStat(CONST char *path, Tcl_StatBuf *buf)
+#    int TclStat(const char *path, Tcl_StatBuf *buf)
 #}
 #declare 106 generic {
 #    int TclStatDeleteProc(TclStatProc_ *proc)
@@ -449,7 +449,7 @@ declare 109 generic {
 # defined here instead of in tcl.decls since they are not stable yet.
 
 declare 111 generic {
-    void Tcl_AddInterpResolvers(Tcl_Interp *interp, CONST char *name,
+    void Tcl_AddInterpResolvers(Tcl_Interp *interp, const char *name,
 	    Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc,
 	    Tcl_ResolveCompiledVarProc *compiledVarProc)
 }
@@ -458,7 +458,7 @@ declare 112 generic {
 	    Tcl_Obj *objPtr)
 }
 declare 113 generic {
-    Tcl_Namespace *Tcl_CreateNamespace(Tcl_Interp *interp, CONST char *name,
+    Tcl_Namespace *Tcl_CreateNamespace(Tcl_Interp *interp, const char *name,
 	    ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc)
 }
 declare 114 generic {
@@ -466,18 +466,18 @@ declare 114 generic {
 }
 declare 115 generic {
     int Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
-	    CONST char *pattern, int resetListFirst)
+	    const char *pattern, int resetListFirst)
 }
 declare 116 generic {
-    Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, CONST char *name,
+    Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, const char *name,
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
 declare 117 generic {
-    Tcl_Namespace *Tcl_FindNamespace(Tcl_Interp *interp, CONST char *name,
+    Tcl_Namespace *Tcl_FindNamespace(Tcl_Interp *interp, const char *name,
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
 declare 118 generic {
-    int Tcl_GetInterpResolvers(Tcl_Interp *interp, CONST char *name,
+    int Tcl_GetInterpResolvers(Tcl_Interp *interp, const char *name,
 	    Tcl_ResolverInfo *resInfo)
 }
 declare 119 generic {
@@ -485,12 +485,12 @@ declare 119 generic {
 	    Tcl_ResolverInfo *resInfo)
 }
 declare 120 generic {
-    Tcl_Var Tcl_FindNamespaceVar(Tcl_Interp *interp, CONST char *name,
+    Tcl_Var Tcl_FindNamespaceVar(Tcl_Interp *interp, const char *name,
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
 declare 121 generic {
     int Tcl_ForgetImport(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
-	    CONST char *pattern)
+	    const char *pattern)
 }
 declare 122 generic {
     Tcl_Command Tcl_GetCommandFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
@@ -511,7 +511,7 @@ declare 126 generic {
 }
 declare 127 generic {
     int Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
-	    CONST char *pattern, int allowOverwrite)
+	    const char *pattern, int allowOverwrite)
 }
 declare 128 generic {
     void Tcl_PopCallFrame(Tcl_Interp *interp)
@@ -521,7 +521,7 @@ declare 129 generic {
 	    Tcl_Namespace *nsPtr, int isProcCallFrame)
 }
 declare 130 generic {
-    int Tcl_RemoveInterpResolvers(Tcl_Interp *interp, CONST char *name)
+    int Tcl_RemoveInterpResolvers(Tcl_Interp *interp, const char *name)
 }
 declare 131 generic {
     void Tcl_SetNamespaceResolvers(Tcl_Namespace *namespacePtr,
@@ -532,12 +532,12 @@ declare 132 generic {
     int TclpHasSockets(Tcl_Interp *interp)
 }
 declare 133 generic {
-    struct tm *TclpGetDate(CONST time_t *time, int useGMT)
+    struct tm *TclpGetDate(const time_t *time, int useGMT)
 }
 # Removed in 8.5
 #declare 134 generic {
-#    size_t TclpStrftime(char *s, size_t maxsize, CONST char *format,
-#	    CONST struct tm *t, int useGMT)
+#    size_t TclpStrftime(char *s, size_t maxsize, const char *format,
+#	    const struct tm *t, int useGMT)
 #}
 #declare 135 generic {
 #    int TclpCheckStackSpace(void)
@@ -546,10 +546,10 @@ declare 133 generic {
 # Added in 8.1:
 
 #declare 137 generic {
-#   int TclpChdir(CONST char *dirName)
+#   int TclpChdir(const char *dirName)
 #}
 declare 138 generic {
-    CONST84_RETURN char *TclGetEnv(CONST char *name, Tcl_DString *valuePtr)
+    CONST84_RETURN char *TclGetEnv(const char *name, Tcl_DString *valuePtr)
 }
 #declare 139 generic {
 #    int TclpLoadFile(Tcl_Interp *interp, char *fileName, char *sym1,
@@ -557,7 +557,7 @@ declare 138 generic {
 #	    Tcl_PackageInitProc **proc2Ptr, ClientData *clientDataPtr)
 #}
 #declare 140 generic {
-#    int TclLooksLikeInt(CONST char *bytes, int length)
+#    int TclLooksLikeInt(const char *bytes, int length)
 #}
 # This is used by TclX, but should otherwise be considered private
 declare 141 generic {
@@ -576,7 +576,7 @@ declare 144 generic {
 	    int index)
 }
 declare 145 generic {
-    CONST86 struct AuxDataType *TclGetAuxDataType(CONST char *typeName)
+    CONST86 struct AuxDataType *TclGetAuxDataType(const char *typeName)
 }
 declare 146 generic {
     TclHandle TclHandleCreate(VOID *ptr)
@@ -618,14 +618,14 @@ declare 153 generic {
 #}
 
 declare 156 generic {
-    void TclRegError(Tcl_Interp *interp, CONST char *msg,
+    void TclRegError(Tcl_Interp *interp, const char *msg,
 	    int status)
 }
 declare 157 generic {
-    Var *TclVarTraceExists(Tcl_Interp *interp, CONST char *varName)
+    Var *TclVarTraceExists(Tcl_Interp *interp, const char *varName)
 }
 declare 158 generic {
-    void TclSetStartupScriptFileName(CONST char *filename)
+    void TclSetStartupScriptFileName(const char *filename)
 }
 declare 159 generic {
     CONST84_RETURN char *TclGetStartupScriptFileName(void)
@@ -682,17 +682,17 @@ declare 168 generic {
 }
 # variant of Tcl_UtfNCmp that takes n as bytes, not chars
 declare 169 generic {
-    int TclpUtfNcmp2(CONST char *s1, CONST char *s2, unsigned long n)
+    int TclpUtfNcmp2(const char *s1, const char *s2, unsigned long n)
 }
 declare 170 generic {
-    int TclCheckInterpTraces(Tcl_Interp *interp, CONST char *command,
+    int TclCheckInterpTraces(Tcl_Interp *interp, const char *command,
             int numChars, Command *cmdPtr, int result, int traceFlags,
-	    int objc, Tcl_Obj *CONST objv[])
+	    int objc, Tcl_Obj *const objv[])
 }
 declare 171 generic {
-    int TclCheckExecutionTraces(Tcl_Interp *interp, CONST char *command,
+    int TclCheckExecutionTraces(Tcl_Interp *interp, const char *command,
             int numChars, Command *cmdPtr, int result, int traceFlags,
-	    int objc, Tcl_Obj *CONST objv[])
+	    int objc, Tcl_Obj *const objv[])
 }
 declare 172 generic {
     int TclInThreadExit(void)
@@ -701,8 +701,8 @@ declare 172 generic {
 # added for 8.4.2
 
 declare 173 generic {
-    int TclUniCharMatch(CONST Tcl_UniChar *string, int strLen,
-	    CONST Tcl_UniChar *pattern, int ptnLen, int flags)
+    int TclUniCharMatch(const Tcl_UniChar *string, int strLen,
+	    const Tcl_UniChar *pattern, int ptnLen, int flags)
 }
 
 # added for 8.4.3
@@ -716,20 +716,20 @@ declare 173 generic {
 
 declare 175 generic {
     int TclCallVarTraces(Interp *iPtr, Var *arrayPtr, Var *varPtr,
-	    CONST char *part1, CONST char *part2, int flags, int leaveErrMsg)
+	    const char *part1, const char *part2, int flags, int leaveErrMsg)
 }
 declare 176 generic {
     void TclCleanupVar(Var *varPtr, Var *arrayPtr)
 }
 declare 177 generic {
-    void TclVarErrMsg(Tcl_Interp *interp, CONST char *part1, CONST char *part2,
-	    CONST char *operation, CONST char *reason)
+    void TclVarErrMsg(Tcl_Interp *interp, const char *part1, const char *part2,
+	    const char *operation, const char *reason)
 }
 declare 178 generic {
-    void Tcl_SetStartupScript(Tcl_Obj *pathPtr, CONST char* encodingName)
+    void Tcl_SetStartupScript(Tcl_Obj *pathPtr, const char* encodingName)
 }
 declare 179 generic {
-    Tcl_Obj *Tcl_GetStartupScript(CONST char **encodingNamePtr)
+    Tcl_Obj *Tcl_GetStartupScript(const char **encodingNamePtr)
 }
 
 # REMOVED
@@ -739,16 +739,16 @@ declare 179 generic {
 # }
 #declare 181 generic {
 #    Tcl_Obj *TclDbNewListObjDirect(int objc, Tcl_Obj **objv,
-#	    CONST char *file, int line)
+#	    const char *file, int line)
 #}
 
 # TclpGmtime and TclpLocaltime promoted to the generic interface from unix
 
 declare 182 generic {
-     struct tm *TclpLocaltime(CONST time_t *clock)
+     struct tm *TclpLocaltime(const time_t *clock)
 }
 declare 183 generic {
-     struct tm *TclpGmtime(CONST time_t *clock)
+     struct tm *TclpGmtime(const time_t *clock)
 }
 
 # For the new "Thread Storage" subsystem.
@@ -802,7 +802,7 @@ declare 183 generic {
 #
 #declare 197 generic {
 #    int TclCompEvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-#		        CONST CmdFrame* invoker, int word)
+#		        const CmdFrame* invoker, int word)
 #}
 declare 198 generic {
     int TclObjGetFrame(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -810,7 +810,7 @@ declare 198 generic {
 }
 
 #declare 199 generic {
-#    int TclMatchIsTrivial(CONST char *pattern)
+#    int TclMatchIsTrivial(const char *pattern)
 #}
 
 # 200-208 exported for use by the test suite [Bug 1054748]
@@ -852,10 +852,10 @@ declare 208 generic {
 #    int TclSetEncodingSearchPath(Tcl_Obj *searchPath)
 #}
 #declare 211 generic {
-#    CONST char * TclpGetEncodingNameFromEnvironment(Tcl_DString *bufPtr)
+#    const char * TclpGetEncodingNameFromEnvironment(Tcl_DString *bufPtr)
 #}
 declare 212 generic {
-    void TclpFindExecutable(CONST char *argv0)
+    void TclpFindExecutable(const char *argv0)
 }
 declare 213 generic {
     Tcl_Obj * TclGetObjNameOfExecutable(void)
@@ -885,7 +885,7 @@ declare 224 generic {
 #
 declare 225 generic {
     Tcl_Obj *TclTraceDictPath(Tcl_Interp *interp, Tcl_Obj *rootPtr,
-	    int keyc, Tcl_Obj *CONST keyv[], int flags)
+	    int keyc, Tcl_Obj *const keyv[], int flags)
 }
 declare 226 generic {
     int TclObjBeingDeleted(Tcl_Obj *objPtr)
@@ -902,12 +902,12 @@ declare 227 generic {
 #  }
 declare 229 generic {
     int	TclPtrMakeUpvar(Tcl_Interp *interp, Var *otherP1Ptr,
-	    CONST char *myName, int myFlags, int index)
+	    const char *myName, int myFlags, int index)
 }
 declare 230 generic {
     Var *TclObjLookupVar(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
-	    CONST char *part2, int flags, CONST char *msg,
-	    CONST int createPart1, CONST int createPart2, Var **arrayPtrPtr)
+	    const char *part2, int flags, const char *msg,
+	    const int createPart1, const int createPart2, Var **arrayPtrPtr)
 }
 declare 231 generic {
     int	TclGetNamespaceFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -917,7 +917,7 @@ declare 231 generic {
 # Bits and pieces of TIP#280's guts
 declare 232 generic {
     int TclEvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags,
-	    CONST CmdFrame *invoker, int word)
+	    const CmdFrame *invoker, int word)
 }
 declare 233 generic {
     void TclGetSrcInfoForPc(CmdFrame *contextPtr)
@@ -925,7 +925,7 @@ declare 233 generic {
 
 # Exports for VarReform compat: Itcl, XOTcl like to peek into our varTables :(
 declare 234 generic {
-    Var *TclVarHashCreateVar(TclVarHashTable *tablePtr, CONST char *key,
+    Var *TclVarHashCreateVar(TclVarHashTable *tablePtr, const char *key,
              int *newPtr)
 }
 declare 235 generic {
@@ -946,7 +946,7 @@ declare 237 generic {
 # include NRE.h too.
 declare 238 generic {
     int TclNRInterpProc(ClientData clientData, Tcl_Interp *interp,
-	    int objc, Tcl_Obj *CONST objv[])
+	    int objc, Tcl_Obj *const objv[])
 }
 declare 239 generic {
     int TclNRInterpProcCore(Tcl_Interp *interp, Tcl_Obj *procNameObj,
@@ -958,7 +958,7 @@ declare 240 generic {
 }
 declare 241 generic {
     int TclNREvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags,
-	    CONST CmdFrame *invoker, int word)
+	    const CmdFrame *invoker, int word)
 }
 declare 242 generic {
     int TclNREvalObjv(Tcl_Interp *interp, int objc,
@@ -981,8 +981,8 @@ declare 1 win {
     void TclWinConvertWSAError(DWORD errCode)
 }
 declare 2 win {
-    struct servent *TclWinGetServByName(CONST char *nm,
-	    CONST char *proto)
+    struct servent *TclWinGetServByName(const char *nm,
+	    const char *proto)
 }
 declare 3 win {
     int TclWinGetSockOpt(int s, int level, int optname,
@@ -1000,7 +1000,7 @@ declare 6 win {
 }
 declare 7 win {
     int TclWinSetSockOpt(int s, int level, int optname,
-	    CONST char FAR *optval, int optlen)
+	    const char FAR *optval, int optlen)
 }
 declare 8 win {
     unsigned long TclpGetPid(Tcl_Pid pid)
@@ -1029,7 +1029,7 @@ declare 14 win {
     int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
 }
 declare 15 win {
-    int TclpCreateProcess(Tcl_Interp *interp, int argc, CONST char **argv,
+    int TclpCreateProcess(Tcl_Interp *interp, int argc, const char **argv,
 	    TclFile inputFile, TclFile outputFile, TclFile errorFile,
 	    Tcl_Pid *pidPtr)
 }
@@ -1044,7 +1044,7 @@ declare 18 win {
     TclFile TclpMakeFile(Tcl_Channel channel, int direction)
 }
 declare 19 win {
-    TclFile TclpOpenFile(CONST char *fname, int mode)
+    TclFile TclpOpenFile(const char *fname, int mode)
 }
 declare 20 win {
     void TclWinAddProcess(HANDLE hProcess, DWORD id)
@@ -1057,7 +1057,7 @@ declare 20 win {
 
 # Added in 8.1:
 declare 22 win {
-    TclFile TclpCreateTempFile(CONST char *contents)
+    TclFile TclpCreateTempFile(const char *contents)
 }
 declare 23 win {
     char *TclpGetTZName(int isdst)
@@ -1107,7 +1107,7 @@ declare 3 unix {
     int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
 }
 declare 4 unix {
-    int TclpCreateProcess(Tcl_Interp *interp, int argc, CONST char **argv,
+    int TclpCreateProcess(Tcl_Interp *interp, int argc, const char **argv,
 	    TclFile inputFile, TclFile outputFile, TclFile errorFile,
 	    Tcl_Pid *pidPtr)
 }
@@ -1119,7 +1119,7 @@ declare 6 unix {
     TclFile TclpMakeFile(Tcl_Channel channel, int direction)
 }
 declare 7 unix {
-    TclFile TclpOpenFile(CONST char *fname, int mode)
+    TclFile TclpOpenFile(const char *fname, int mode)
 }
 declare 8 unix {
     int TclUnixWaitForFile(int fd, int mask, int timeout)
@@ -1128,7 +1128,7 @@ declare 8 unix {
 # Added in 8.1:
 
 declare 9 unix {
-    TclFile TclpCreateTempFile(CONST char *contents)
+    TclFile TclpCreateTempFile(const char *contents)
 }
 
 # Added in 8.4:
@@ -1139,10 +1139,10 @@ declare 10 unix {
 # Slots 11 and 12 are forwarders for functions that were promoted to
 # generic Stubs
 declare 11 unix {
-    struct tm *TclpLocaltime_unix(CONST time_t *clock)
+    struct tm *TclpLocaltime_unix(const time_t *clock)
 }
 declare 12 unix {
-    struct tm *TclpGmtime_unix(CONST time_t *clock)
+    struct tm *TclpGmtime_unix(const time_t *clock)
 }
 declare 13 unix {
     char *TclpInetNtoa(struct in_addr addr)
@@ -1151,8 +1151,8 @@ declare 13 unix {
 # Added in 8.5:
 
 declare 14 unix {
-    int TclUnixCopyFile(CONST char *src, CONST char *dst,
-	    CONST Tcl_StatBuf *statBufPtr, int dontCopyAtts)
+    int TclUnixCopyFile(const char *src, const char *dst,
+	    const Tcl_StatBuf *statBufPtr, int dontCopyAtts)
 }
 
 ################################
@@ -1167,11 +1167,11 @@ declare 16 macosx {
 	    Tcl_Obj *fileName, Tcl_Obj *attributePtr)
 }
 declare 17 macosx {
-    int TclMacOSXCopyFileAttributes(CONST char *src, CONST char *dst,
-	    CONST Tcl_StatBuf *statBufPtr)
+    int TclMacOSXCopyFileAttributes(const char *src, const char *dst,
+	    const Tcl_StatBuf *statBufPtr)
 }
 declare 18 macosx {
-    int TclMacOSXMatchType(Tcl_Interp *interp, CONST char *pathName,
-	    CONST char *fileName, Tcl_StatBuf *statBufPtr,
+    int TclMacOSXMatchType(Tcl_Interp *interp, const char *pathName,
+	    const char *fileName, Tcl_StatBuf *statBufPtr,
 	    Tcl_GlobTypeData *types)
 }
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index b12fa91..ab08e3b 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIntDecls.h,v 1.124 2008/10/05 20:47:52 nijtmans Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.125 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -55,7 +55,7 @@ EXTERN void		TclAllocateFreeObjects (void);
 #ifndef TclCleanupChildren_TCL_DECLARED
 #define TclCleanupChildren_TCL_DECLARED
 /* 5 */
-EXTERN int		TclCleanupChildren (Tcl_Interp * interp, int numPids, 
+EXTERN int		TclCleanupChildren (Tcl_Interp * interp, int numPids,
 				Tcl_Pid * pidPtr, Tcl_Channel errorChan);
 #endif
 #endif /* UNIX */
@@ -63,7 +63,7 @@ EXTERN int		TclCleanupChildren (Tcl_Interp * interp, int numPids,
 #ifndef TclCleanupChildren_TCL_DECLARED
 #define TclCleanupChildren_TCL_DECLARED
 /* 5 */
-EXTERN int		TclCleanupChildren (Tcl_Interp * interp, int numPids, 
+EXTERN int		TclCleanupChildren (Tcl_Interp * interp, int numPids,
 				Tcl_Pid * pidPtr, Tcl_Channel errorChan);
 #endif
 #endif /* WIN */
@@ -71,7 +71,7 @@ EXTERN int		TclCleanupChildren (Tcl_Interp * interp, int numPids,
 #ifndef TclCleanupChildren_TCL_DECLARED
 #define TclCleanupChildren_TCL_DECLARED
 /* 5 */
-EXTERN int		TclCleanupChildren (Tcl_Interp * interp, int numPids, 
+EXTERN int		TclCleanupChildren (Tcl_Interp * interp, int numPids,
 				Tcl_Pid * pidPtr, Tcl_Channel errorChan);
 #endif
 #endif /* MACOSX */
@@ -83,23 +83,23 @@ EXTERN void		TclCleanupCommand (Command * cmdPtr);
 #ifndef TclCopyAndCollapse_TCL_DECLARED
 #define TclCopyAndCollapse_TCL_DECLARED
 /* 7 */
-EXTERN int		TclCopyAndCollapse (int count, CONST char * src, 
+EXTERN int		TclCopyAndCollapse (int count, const char * src,
 				char * dst);
 #endif
 #ifndef TclCopyChannel_TCL_DECLARED
 #define TclCopyChannel_TCL_DECLARED
 /* 8 */
-EXTERN int		TclCopyChannel (Tcl_Interp * interp, 
-				Tcl_Channel inChan, Tcl_Channel outChan, 
+EXTERN int		TclCopyChannel (Tcl_Interp * interp,
+				Tcl_Channel inChan, Tcl_Channel outChan,
 				int toRead, Tcl_Obj * cmdPtr);
 #endif
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
 #ifndef TclCreatePipeline_TCL_DECLARED
 #define TclCreatePipeline_TCL_DECLARED
 /* 9 */
-EXTERN int		TclCreatePipeline (Tcl_Interp * interp, int argc, 
-				CONST char ** argv, Tcl_Pid ** pidArrayPtr, 
-				TclFile * inPipePtr, TclFile * outPipePtr, 
+EXTERN int		TclCreatePipeline (Tcl_Interp * interp, int argc,
+				const char ** argv, Tcl_Pid ** pidArrayPtr,
+				TclFile * inPipePtr, TclFile * outPipePtr,
 				TclFile * errFilePtr);
 #endif
 #endif /* UNIX */
@@ -107,9 +107,9 @@ EXTERN int		TclCreatePipeline (Tcl_Interp * interp, int argc,
 #ifndef TclCreatePipeline_TCL_DECLARED
 #define TclCreatePipeline_TCL_DECLARED
 /* 9 */
-EXTERN int		TclCreatePipeline (Tcl_Interp * interp, int argc, 
-				CONST char ** argv, Tcl_Pid ** pidArrayPtr, 
-				TclFile * inPipePtr, TclFile * outPipePtr, 
+EXTERN int		TclCreatePipeline (Tcl_Interp * interp, int argc,
+				const char ** argv, Tcl_Pid ** pidArrayPtr,
+				TclFile * inPipePtr, TclFile * outPipePtr,
 				TclFile * errFilePtr);
 #endif
 #endif /* WIN */
@@ -117,30 +117,30 @@ EXTERN int		TclCreatePipeline (Tcl_Interp * interp, int argc,
 #ifndef TclCreatePipeline_TCL_DECLARED
 #define TclCreatePipeline_TCL_DECLARED
 /* 9 */
-EXTERN int		TclCreatePipeline (Tcl_Interp * interp, int argc, 
-				CONST char ** argv, Tcl_Pid ** pidArrayPtr, 
-				TclFile * inPipePtr, TclFile * outPipePtr, 
+EXTERN int		TclCreatePipeline (Tcl_Interp * interp, int argc,
+				const char ** argv, Tcl_Pid ** pidArrayPtr,
+				TclFile * inPipePtr, TclFile * outPipePtr,
 				TclFile * errFilePtr);
 #endif
 #endif /* MACOSX */
 #ifndef TclCreateProc_TCL_DECLARED
 #define TclCreateProc_TCL_DECLARED
 /* 10 */
-EXTERN int		TclCreateProc (Tcl_Interp * interp, 
-				Namespace * nsPtr, CONST char * procName, 
-				Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr, 
+EXTERN int		TclCreateProc (Tcl_Interp * interp,
+				Namespace * nsPtr, const char * procName,
+				Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr,
 				Proc ** procPtrPtr);
 #endif
 #ifndef TclDeleteCompiledLocalVars_TCL_DECLARED
 #define TclDeleteCompiledLocalVars_TCL_DECLARED
 /* 11 */
-EXTERN void		TclDeleteCompiledLocalVars (Interp * iPtr, 
+EXTERN void		TclDeleteCompiledLocalVars (Interp * iPtr,
 				CallFrame * framePtr);
 #endif
 #ifndef TclDeleteVars_TCL_DECLARED
 #define TclDeleteVars_TCL_DECLARED
 /* 12 */
-EXTERN void		TclDeleteVars (Interp * iPtr, 
+EXTERN void		TclDeleteVars (Interp * iPtr,
 				TclVarHashTable * tablePtr);
 #endif
 /* Slot 13 is reserved */
@@ -163,16 +163,16 @@ EXTERN void		TclExprFloatError (Tcl_Interp * interp, double value);
 #ifndef TclFindElement_TCL_DECLARED
 #define TclFindElement_TCL_DECLARED
 /* 22 */
-EXTERN int		TclFindElement (Tcl_Interp * interp, 
-				CONST char * listStr, int listLength, 
-				CONST char ** elementPtr, 
-				CONST char ** nextPtr, int * sizePtr, 
+EXTERN int		TclFindElement (Tcl_Interp * interp,
+				const char * listStr, int listLength,
+				const char ** elementPtr,
+				const char ** nextPtr, int * sizePtr,
 				int * bracePtr);
 #endif
 #ifndef TclFindProc_TCL_DECLARED
 #define TclFindProc_TCL_DECLARED
 /* 23 */
-EXTERN Proc *		TclFindProc (Interp * iPtr, CONST char * procName);
+EXTERN Proc *		TclFindProc (Interp * iPtr, const char * procName);
 #endif
 /* Slot 24 is reserved */
 #ifndef TclFreePackageInfo_TCL_DECLARED
@@ -192,20 +192,20 @@ EXTERN Tcl_Channel	TclpGetDefaultStdChannel (int type);
 #ifndef TclGetExtension_TCL_DECLARED
 #define TclGetExtension_TCL_DECLARED
 /* 31 */
-EXTERN CONST char *	TclGetExtension (CONST char * name);
+EXTERN const char *	TclGetExtension (const char * name);
 #endif
 #ifndef TclGetFrame_TCL_DECLARED
 #define TclGetFrame_TCL_DECLARED
 /* 32 */
-EXTERN int		TclGetFrame (Tcl_Interp * interp, CONST char * str, 
+EXTERN int		TclGetFrame (Tcl_Interp * interp, const char * str,
 				CallFrame ** framePtrPtr);
 #endif
 /* Slot 33 is reserved */
 #ifndef TclGetIntForIndex_TCL_DECLARED
 #define TclGetIntForIndex_TCL_DECLARED
 /* 34 */
-EXTERN int		TclGetIntForIndex (Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, int endValue, 
+EXTERN int		TclGetIntForIndex (Tcl_Interp * interp,
+				Tcl_Obj * objPtr, int endValue,
 				int * indexPtr);
 #endif
 /* Slot 35 is reserved */
@@ -213,18 +213,18 @@ EXTERN int		TclGetIntForIndex (Tcl_Interp * interp,
 #ifndef TclGetLoadedPackages_TCL_DECLARED
 #define TclGetLoadedPackages_TCL_DECLARED
 /* 37 */
-EXTERN int		TclGetLoadedPackages (Tcl_Interp * interp, 
+EXTERN int		TclGetLoadedPackages (Tcl_Interp * interp,
 				char * targetName);
 #endif
 #ifndef TclGetNamespaceForQualName_TCL_DECLARED
 #define TclGetNamespaceForQualName_TCL_DECLARED
 /* 38 */
-EXTERN int		TclGetNamespaceForQualName (Tcl_Interp * interp, 
-				CONST char * qualName, Namespace * cxtNsPtr, 
-				int flags, Namespace ** nsPtrPtr, 
-				Namespace ** altNsPtrPtr, 
-				Namespace ** actualCxtPtrPtr, 
-				CONST char ** simpleNamePtr);
+EXTERN int		TclGetNamespaceForQualName (Tcl_Interp * interp,
+				const char * qualName, Namespace * cxtNsPtr,
+				int flags, Namespace ** nsPtrPtr,
+				Namespace ** altNsPtrPtr,
+				Namespace ** actualCxtPtrPtr,
+				const char ** simpleNamePtr);
 #endif
 #ifndef TclGetObjInterpProc_TCL_DECLARED
 #define TclGetObjInterpProc_TCL_DECLARED
@@ -234,8 +234,8 @@ EXTERN TclObjCmdProcType TclGetObjInterpProc (void);
 #ifndef TclGetOpenMode_TCL_DECLARED
 #define TclGetOpenMode_TCL_DECLARED
 /* 40 */
-EXTERN int		TclGetOpenMode (Tcl_Interp * interp, 
-				CONST char * str, int * seekFlagPtr);
+EXTERN int		TclGetOpenMode (Tcl_Interp * interp,
+				const char * str, int * seekFlagPtr);
 #endif
 #ifndef TclGetOriginalCommand_TCL_DECLARED
 #define TclGetOriginalCommand_TCL_DECLARED
@@ -245,14 +245,14 @@ EXTERN Tcl_Command	TclGetOriginalCommand (Tcl_Command command);
 #ifndef TclpGetUserHome_TCL_DECLARED
 #define TclpGetUserHome_TCL_DECLARED
 /* 42 */
-EXTERN char *		TclpGetUserHome (CONST char * name, 
+EXTERN char *		TclpGetUserHome (const char * name,
 				Tcl_DString * bufferPtr);
 #endif
 /* Slot 43 is reserved */
 #ifndef TclGuessPackageName_TCL_DECLARED
 #define TclGuessPackageName_TCL_DECLARED
 /* 44 */
-EXTERN int		TclGuessPackageName (CONST char * fileName, 
+EXTERN int		TclGuessPackageName (const char * fileName,
 				Tcl_DString * bufPtr);
 #endif
 #ifndef TclHideUnsafeCommands_TCL_DECLARED
@@ -271,7 +271,7 @@ EXTERN int		TclInExit (void);
 #ifndef TclInitCompiledLocals_TCL_DECLARED
 #define TclInitCompiledLocals_TCL_DECLARED
 /* 50 */
-EXTERN void		TclInitCompiledLocals (Tcl_Interp * interp, 
+EXTERN void		TclInitCompiledLocals (Tcl_Interp * interp,
 				CallFrame * framePtr, Namespace * nsPtr);
 #endif
 #ifndef TclInterpInit_TCL_DECLARED
@@ -283,16 +283,16 @@ EXTERN int		TclInterpInit (Tcl_Interp * interp);
 #ifndef TclInvokeObjectCommand_TCL_DECLARED
 #define TclInvokeObjectCommand_TCL_DECLARED
 /* 53 */
-EXTERN int		TclInvokeObjectCommand (ClientData clientData, 
-				Tcl_Interp * interp, int argc, 
+EXTERN int		TclInvokeObjectCommand (ClientData clientData,
+				Tcl_Interp * interp, int argc,
 				CONST84 char ** argv);
 #endif
 #ifndef TclInvokeStringCommand_TCL_DECLARED
 #define TclInvokeStringCommand_TCL_DECLARED
 /* 54 */
-EXTERN int		TclInvokeStringCommand (ClientData clientData, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[]);
+EXTERN int		TclInvokeStringCommand (ClientData clientData,
+				Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[]);
 #endif
 #ifndef TclIsProc_TCL_DECLARED
 #define TclIsProc_TCL_DECLARED
@@ -304,16 +304,16 @@ EXTERN Proc *		TclIsProc (Command * cmdPtr);
 #ifndef TclLookupVar_TCL_DECLARED
 #define TclLookupVar_TCL_DECLARED
 /* 58 */
-EXTERN Var *		TclLookupVar (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
-				int flags, CONST char * msg, int createPart1, 
+EXTERN Var *		TclLookupVar (Tcl_Interp * interp,
+				const char * part1, const char * part2,
+				int flags, const char * msg, int createPart1,
 				int createPart2, Var ** arrayPtrPtr);
 #endif
 /* Slot 59 is reserved */
 #ifndef TclNeedSpace_TCL_DECLARED
 #define TclNeedSpace_TCL_DECLARED
 /* 60 */
-EXTERN int		TclNeedSpace (CONST char * start, CONST char * end);
+EXTERN int		TclNeedSpace (const char * start, const char * end);
 #endif
 #ifndef TclNewProcBodyObj_TCL_DECLARED
 #define TclNewProcBodyObj_TCL_DECLARED
@@ -328,15 +328,15 @@ EXTERN int		TclObjCommandComplete (Tcl_Obj * cmdPtr);
 #ifndef TclObjInterpProc_TCL_DECLARED
 #define TclObjInterpProc_TCL_DECLARED
 /* 63 */
-EXTERN int		TclObjInterpProc (ClientData clientData, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[]);
+EXTERN int		TclObjInterpProc (ClientData clientData,
+				Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[]);
 #endif
 #ifndef TclObjInvoke_TCL_DECLARED
 #define TclObjInvoke_TCL_DECLARED
 /* 64 */
-EXTERN int		TclObjInvoke (Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[], int flags);
+EXTERN int		TclObjInvoke (Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[], int flags);
 #endif
 /* Slot 65 is reserved */
 /* Slot 66 is reserved */
@@ -392,14 +392,14 @@ EXTERN char *		TclpRealloc (char * ptr, unsigned int size);
 #ifndef TclPrecTraceProc_TCL_DECLARED
 #define TclPrecTraceProc_TCL_DECLARED
 /* 88 */
-EXTERN char *		TclPrecTraceProc (ClientData clientData, 
-				Tcl_Interp * interp, CONST char * name1, 
-				CONST char * name2, int flags);
+EXTERN char *		TclPrecTraceProc (ClientData clientData,
+				Tcl_Interp * interp, const char * name1,
+				const char * name2, int flags);
 #endif
 #ifndef TclPreventAliasLoop_TCL_DECLARED
 #define TclPreventAliasLoop_TCL_DECLARED
 /* 89 */
-EXTERN int		TclPreventAliasLoop (Tcl_Interp * interp, 
+EXTERN int		TclPreventAliasLoop (Tcl_Interp * interp,
 				Tcl_Interp * cmdInterp, Tcl_Command cmd);
 #endif
 /* Slot 90 is reserved */
@@ -411,10 +411,10 @@ EXTERN void		TclProcCleanupProc (Proc * procPtr);
 #ifndef TclProcCompileProc_TCL_DECLARED
 #define TclProcCompileProc_TCL_DECLARED
 /* 92 */
-EXTERN int		TclProcCompileProc (Tcl_Interp * interp, 
-				Proc * procPtr, Tcl_Obj * bodyPtr, 
-				Namespace * nsPtr, CONST char * description, 
-				CONST char * procName);
+EXTERN int		TclProcCompileProc (Tcl_Interp * interp,
+				Proc * procPtr, Tcl_Obj * bodyPtr,
+				Namespace * nsPtr, const char * description,
+				const char * procName);
 #endif
 #ifndef TclProcDeleteProc_TCL_DECLARED
 #define TclProcDeleteProc_TCL_DECLARED
@@ -426,13 +426,13 @@ EXTERN void		TclProcDeleteProc (ClientData clientData);
 #ifndef TclRenameCommand_TCL_DECLARED
 #define TclRenameCommand_TCL_DECLARED
 /* 96 */
-EXTERN int		TclRenameCommand (Tcl_Interp * interp, 
-				CONST char * oldName, CONST char * newName);
+EXTERN int		TclRenameCommand (Tcl_Interp * interp,
+				const char * oldName, const char * newName);
 #endif
 #ifndef TclResetShadowedCmdRefs_TCL_DECLARED
 #define TclResetShadowedCmdRefs_TCL_DECLARED
 /* 97 */
-EXTERN void		TclResetShadowedCmdRefs (Tcl_Interp * interp, 
+EXTERN void		TclResetShadowedCmdRefs (Tcl_Interp * interp,
 				Command * newCmdPtr);
 #endif
 #ifndef TclServiceIdle_TCL_DECLARED
@@ -455,8 +455,8 @@ EXTERN void		TclSetupEnv (Tcl_Interp * interp);
 #ifndef TclSockGetPort_TCL_DECLARED
 #define TclSockGetPort_TCL_DECLARED
 /* 103 */
-EXTERN int		TclSockGetPort (Tcl_Interp * interp, 
-				CONST char * str, CONST char * proto, 
+EXTERN int		TclSockGetPort (Tcl_Interp * interp,
+				const char * str, const char * proto,
 				int * portPtr);
 #endif
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
@@ -497,23 +497,23 @@ EXTERN int		TclUpdateReturnInfo (Interp * iPtr);
 #ifndef Tcl_AddInterpResolvers_TCL_DECLARED
 #define Tcl_AddInterpResolvers_TCL_DECLARED
 /* 111 */
-EXTERN void		Tcl_AddInterpResolvers (Tcl_Interp * interp, 
-				CONST char * name, 
-				Tcl_ResolveCmdProc * cmdProc, 
-				Tcl_ResolveVarProc * varProc, 
+EXTERN void		Tcl_AddInterpResolvers (Tcl_Interp * interp,
+				const char * name,
+				Tcl_ResolveCmdProc * cmdProc,
+				Tcl_ResolveVarProc * varProc,
 				Tcl_ResolveCompiledVarProc * compiledVarProc);
 #endif
 #ifndef Tcl_AppendExportList_TCL_DECLARED
 #define Tcl_AppendExportList_TCL_DECLARED
 /* 112 */
-EXTERN int		Tcl_AppendExportList (Tcl_Interp * interp, 
+EXTERN int		Tcl_AppendExportList (Tcl_Interp * interp,
 				Tcl_Namespace * nsPtr, Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_CreateNamespace_TCL_DECLARED
 #define Tcl_CreateNamespace_TCL_DECLARED
 /* 113 */
-EXTERN Tcl_Namespace *	Tcl_CreateNamespace (Tcl_Interp * interp, 
-				CONST char * name, ClientData clientData, 
+EXTERN Tcl_Namespace *	Tcl_CreateNamespace (Tcl_Interp * interp,
+				const char * name, ClientData clientData,
 				Tcl_NamespaceDeleteProc * deleteProc);
 #endif
 #ifndef Tcl_DeleteNamespace_TCL_DECLARED
@@ -524,61 +524,61 @@ EXTERN void		Tcl_DeleteNamespace (Tcl_Namespace * nsPtr);
 #ifndef Tcl_Export_TCL_DECLARED
 #define Tcl_Export_TCL_DECLARED
 /* 115 */
-EXTERN int		Tcl_Export (Tcl_Interp * interp, 
-				Tcl_Namespace * nsPtr, CONST char * pattern, 
+EXTERN int		Tcl_Export (Tcl_Interp * interp,
+				Tcl_Namespace * nsPtr, const char * pattern,
 				int resetListFirst);
 #endif
 #ifndef Tcl_FindCommand_TCL_DECLARED
 #define Tcl_FindCommand_TCL_DECLARED
 /* 116 */
-EXTERN Tcl_Command	Tcl_FindCommand (Tcl_Interp * interp, 
-				CONST char * name, 
+EXTERN Tcl_Command	Tcl_FindCommand (Tcl_Interp * interp,
+				const char * name,
 				Tcl_Namespace * contextNsPtr, int flags);
 #endif
 #ifndef Tcl_FindNamespace_TCL_DECLARED
 #define Tcl_FindNamespace_TCL_DECLARED
 /* 117 */
-EXTERN Tcl_Namespace *	Tcl_FindNamespace (Tcl_Interp * interp, 
-				CONST char * name, 
+EXTERN Tcl_Namespace *	Tcl_FindNamespace (Tcl_Interp * interp,
+				const char * name,
 				Tcl_Namespace * contextNsPtr, int flags);
 #endif
 #ifndef Tcl_GetInterpResolvers_TCL_DECLARED
 #define Tcl_GetInterpResolvers_TCL_DECLARED
 /* 118 */
-EXTERN int		Tcl_GetInterpResolvers (Tcl_Interp * interp, 
-				CONST char * name, 
+EXTERN int		Tcl_GetInterpResolvers (Tcl_Interp * interp,
+				const char * name,
 				Tcl_ResolverInfo * resInfo);
 #endif
 #ifndef Tcl_GetNamespaceResolvers_TCL_DECLARED
 #define Tcl_GetNamespaceResolvers_TCL_DECLARED
 /* 119 */
 EXTERN int		Tcl_GetNamespaceResolvers (
-				Tcl_Namespace * namespacePtr, 
+				Tcl_Namespace * namespacePtr,
 				Tcl_ResolverInfo * resInfo);
 #endif
 #ifndef Tcl_FindNamespaceVar_TCL_DECLARED
 #define Tcl_FindNamespaceVar_TCL_DECLARED
 /* 120 */
-EXTERN Tcl_Var		Tcl_FindNamespaceVar (Tcl_Interp * interp, 
-				CONST char * name, 
+EXTERN Tcl_Var		Tcl_FindNamespaceVar (Tcl_Interp * interp,
+				const char * name,
 				Tcl_Namespace * contextNsPtr, int flags);
 #endif
 #ifndef Tcl_ForgetImport_TCL_DECLARED
 #define Tcl_ForgetImport_TCL_DECLARED
 /* 121 */
-EXTERN int		Tcl_ForgetImport (Tcl_Interp * interp, 
-				Tcl_Namespace * nsPtr, CONST char * pattern);
+EXTERN int		Tcl_ForgetImport (Tcl_Interp * interp,
+				Tcl_Namespace * nsPtr, const char * pattern);
 #endif
 #ifndef Tcl_GetCommandFromObj_TCL_DECLARED
 #define Tcl_GetCommandFromObj_TCL_DECLARED
 /* 122 */
-EXTERN Tcl_Command	Tcl_GetCommandFromObj (Tcl_Interp * interp, 
+EXTERN Tcl_Command	Tcl_GetCommandFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_GetCommandFullName_TCL_DECLARED
 #define Tcl_GetCommandFullName_TCL_DECLARED
 /* 123 */
-EXTERN void		Tcl_GetCommandFullName (Tcl_Interp * interp, 
+EXTERN void		Tcl_GetCommandFullName (Tcl_Interp * interp,
 				Tcl_Command command, Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_GetCurrentNamespace_TCL_DECLARED
@@ -594,14 +594,14 @@ EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace (Tcl_Interp * interp);
 #ifndef Tcl_GetVariableFullName_TCL_DECLARED
 #define Tcl_GetVariableFullName_TCL_DECLARED
 /* 126 */
-EXTERN void		Tcl_GetVariableFullName (Tcl_Interp * interp, 
+EXTERN void		Tcl_GetVariableFullName (Tcl_Interp * interp,
 				Tcl_Var variable, Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_Import_TCL_DECLARED
 #define Tcl_Import_TCL_DECLARED
 /* 127 */
-EXTERN int		Tcl_Import (Tcl_Interp * interp, 
-				Tcl_Namespace * nsPtr, CONST char * pattern, 
+EXTERN int		Tcl_Import (Tcl_Interp * interp,
+				Tcl_Namespace * nsPtr, const char * pattern,
 				int allowOverwrite);
 #endif
 #ifndef Tcl_PopCallFrame_TCL_DECLARED
@@ -612,23 +612,23 @@ EXTERN void		Tcl_PopCallFrame (Tcl_Interp * interp);
 #ifndef Tcl_PushCallFrame_TCL_DECLARED
 #define Tcl_PushCallFrame_TCL_DECLARED
 /* 129 */
-EXTERN int		Tcl_PushCallFrame (Tcl_Interp * interp, 
-				Tcl_CallFrame * framePtr, 
+EXTERN int		Tcl_PushCallFrame (Tcl_Interp * interp,
+				Tcl_CallFrame * framePtr,
 				Tcl_Namespace * nsPtr, int isProcCallFrame);
 #endif
 #ifndef Tcl_RemoveInterpResolvers_TCL_DECLARED
 #define Tcl_RemoveInterpResolvers_TCL_DECLARED
 /* 130 */
-EXTERN int		Tcl_RemoveInterpResolvers (Tcl_Interp * interp, 
-				CONST char * name);
+EXTERN int		Tcl_RemoveInterpResolvers (Tcl_Interp * interp,
+				const char * name);
 #endif
 #ifndef Tcl_SetNamespaceResolvers_TCL_DECLARED
 #define Tcl_SetNamespaceResolvers_TCL_DECLARED
 /* 131 */
 EXTERN void		Tcl_SetNamespaceResolvers (
-				Tcl_Namespace * namespacePtr, 
-				Tcl_ResolveCmdProc * cmdProc, 
-				Tcl_ResolveVarProc * varProc, 
+				Tcl_Namespace * namespacePtr,
+				Tcl_ResolveCmdProc * cmdProc,
+				Tcl_ResolveVarProc * varProc,
 				Tcl_ResolveCompiledVarProc * compiledVarProc);
 #endif
 #ifndef TclpHasSockets_TCL_DECLARED
@@ -639,7 +639,7 @@ EXTERN int		TclpHasSockets (Tcl_Interp * interp);
 #ifndef TclpGetDate_TCL_DECLARED
 #define TclpGetDate_TCL_DECLARED
 /* 133 */
-EXTERN struct tm *	TclpGetDate (CONST time_t * time, int useGMT);
+EXTERN struct tm *	TclpGetDate (const time_t * time, int useGMT);
 #endif
 /* Slot 134 is reserved */
 /* Slot 135 is reserved */
@@ -648,7 +648,7 @@ EXTERN struct tm *	TclpGetDate (CONST time_t * time, int useGMT);
 #ifndef TclGetEnv_TCL_DECLARED
 #define TclGetEnv_TCL_DECLARED
 /* 138 */
-EXTERN CONST84_RETURN char * TclGetEnv (CONST char * name, 
+EXTERN CONST84_RETURN char * TclGetEnv (const char * name,
 				Tcl_DString * valuePtr);
 #endif
 /* Slot 139 is reserved */
@@ -656,32 +656,32 @@ EXTERN CONST84_RETURN char * TclGetEnv (CONST char * name,
 #ifndef TclpGetCwd_TCL_DECLARED
 #define TclpGetCwd_TCL_DECLARED
 /* 141 */
-EXTERN CONST84_RETURN char * TclpGetCwd (Tcl_Interp * interp, 
+EXTERN CONST84_RETURN char * TclpGetCwd (Tcl_Interp * interp,
 				Tcl_DString * cwdPtr);
 #endif
 #ifndef TclSetByteCodeFromAny_TCL_DECLARED
 #define TclSetByteCodeFromAny_TCL_DECLARED
 /* 142 */
-EXTERN int		TclSetByteCodeFromAny (Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, CompileHookProc * hookProc, 
+EXTERN int		TclSetByteCodeFromAny (Tcl_Interp * interp,
+				Tcl_Obj * objPtr, CompileHookProc * hookProc,
 				ClientData clientData);
 #endif
 #ifndef TclAddLiteralObj_TCL_DECLARED
 #define TclAddLiteralObj_TCL_DECLARED
 /* 143 */
-EXTERN int		TclAddLiteralObj (struct CompileEnv * envPtr, 
+EXTERN int		TclAddLiteralObj (struct CompileEnv * envPtr,
 				Tcl_Obj * objPtr, LiteralEntry ** litPtrPtr);
 #endif
 #ifndef TclHideLiteral_TCL_DECLARED
 #define TclHideLiteral_TCL_DECLARED
 /* 144 */
-EXTERN void		TclHideLiteral (Tcl_Interp * interp, 
+EXTERN void		TclHideLiteral (Tcl_Interp * interp,
 				struct CompileEnv * envPtr, int index);
 #endif
 #ifndef TclGetAuxDataType_TCL_DECLARED
 #define TclGetAuxDataType_TCL_DECLARED
 /* 145 */
-EXTERN CONST86 struct AuxDataType * TclGetAuxDataType (CONST char * typeName);
+EXTERN CONST86 struct AuxDataType * TclGetAuxDataType (const char * typeName);
 #endif
 #ifndef TclHandleCreate_TCL_DECLARED
 #define TclHandleCreate_TCL_DECLARED
@@ -711,7 +711,7 @@ EXTERN int		TclRegAbout (Tcl_Interp * interp, Tcl_RegExp re);
 #ifndef TclRegExpRangeUniChar_TCL_DECLARED
 #define TclRegExpRangeUniChar_TCL_DECLARED
 /* 151 */
-EXTERN void		TclRegExpRangeUniChar (Tcl_RegExp re, int index, 
+EXTERN void		TclRegExpRangeUniChar (Tcl_RegExp re, int index,
 				int * startPtr, int * endPtr);
 #endif
 #ifndef TclSetLibraryPath_TCL_DECLARED
@@ -729,19 +729,19 @@ EXTERN Tcl_Obj *	TclGetLibraryPath (void);
 #ifndef TclRegError_TCL_DECLARED
 #define TclRegError_TCL_DECLARED
 /* 156 */
-EXTERN void		TclRegError (Tcl_Interp * interp, CONST char * msg, 
+EXTERN void		TclRegError (Tcl_Interp * interp, const char * msg,
 				int status);
 #endif
 #ifndef TclVarTraceExists_TCL_DECLARED
 #define TclVarTraceExists_TCL_DECLARED
 /* 157 */
-EXTERN Var *		TclVarTraceExists (Tcl_Interp * interp, 
-				CONST char * varName);
+EXTERN Var *		TclVarTraceExists (Tcl_Interp * interp,
+				const char * varName);
 #endif
 #ifndef TclSetStartupScriptFileName_TCL_DECLARED
 #define TclSetStartupScriptFileName_TCL_DECLARED
 /* 158 */
-EXTERN void		TclSetStartupScriptFileName (CONST char * filename);
+EXTERN void		TclSetStartupScriptFileName (const char * filename);
 #endif
 #ifndef TclGetStartupScriptFileName_TCL_DECLARED
 #define TclGetStartupScriptFileName_TCL_DECLARED
@@ -752,13 +752,13 @@ EXTERN CONST84_RETURN char * TclGetStartupScriptFileName (void);
 #ifndef TclChannelTransform_TCL_DECLARED
 #define TclChannelTransform_TCL_DECLARED
 /* 161 */
-EXTERN int		TclChannelTransform (Tcl_Interp * interp, 
+EXTERN int		TclChannelTransform (Tcl_Interp * interp,
 				Tcl_Channel chan, Tcl_Obj * cmdObjPtr);
 #endif
 #ifndef TclChannelEventScriptInvoker_TCL_DECLARED
 #define TclChannelEventScriptInvoker_TCL_DECLARED
 /* 162 */
-EXTERN void		TclChannelEventScriptInvoker (ClientData clientData, 
+EXTERN void		TclChannelEventScriptInvoker (ClientData clientData,
 				int flags);
 #endif
 #ifndef TclGetInstructionTable_TCL_DECLARED
@@ -779,8 +779,8 @@ EXTERN void		TclpSetInitialEncodings (void);
 #ifndef TclListObjSetElement_TCL_DECLARED
 #define TclListObjSetElement_TCL_DECLARED
 /* 166 */
-EXTERN int		TclListObjSetElement (Tcl_Interp * interp, 
-				Tcl_Obj * listPtr, int index, 
+EXTERN int		TclListObjSetElement (Tcl_Interp * interp,
+				Tcl_Obj * listPtr, int index,
 				Tcl_Obj * valuePtr);
 #endif
 #ifndef TclSetStartupScriptPath_TCL_DECLARED
@@ -796,24 +796,24 @@ EXTERN Tcl_Obj *	TclGetStartupScriptPath (void);
 #ifndef TclpUtfNcmp2_TCL_DECLARED
 #define TclpUtfNcmp2_TCL_DECLARED
 /* 169 */
-EXTERN int		TclpUtfNcmp2 (CONST char * s1, CONST char * s2, 
+EXTERN int		TclpUtfNcmp2 (const char * s1, const char * s2,
 				unsigned long n);
 #endif
 #ifndef TclCheckInterpTraces_TCL_DECLARED
 #define TclCheckInterpTraces_TCL_DECLARED
 /* 170 */
-EXTERN int		TclCheckInterpTraces (Tcl_Interp * interp, 
-				CONST char * command, int numChars, 
-				Command * cmdPtr, int result, int traceFlags, 
-				int objc, Tcl_Obj *CONST objv[]);
+EXTERN int		TclCheckInterpTraces (Tcl_Interp * interp,
+				const char * command, int numChars,
+				Command * cmdPtr, int result, int traceFlags,
+				int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef TclCheckExecutionTraces_TCL_DECLARED
 #define TclCheckExecutionTraces_TCL_DECLARED
 /* 171 */
-EXTERN int		TclCheckExecutionTraces (Tcl_Interp * interp, 
-				CONST char * command, int numChars, 
-				Command * cmdPtr, int result, int traceFlags, 
-				int objc, Tcl_Obj *CONST objv[]);
+EXTERN int		TclCheckExecutionTraces (Tcl_Interp * interp,
+				const char * command, int numChars,
+				Command * cmdPtr, int result, int traceFlags,
+				int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef TclInThreadExit_TCL_DECLARED
 #define TclInThreadExit_TCL_DECLARED
@@ -823,17 +823,17 @@ EXTERN int		TclInThreadExit (void);
 #ifndef TclUniCharMatch_TCL_DECLARED
 #define TclUniCharMatch_TCL_DECLARED
 /* 173 */
-EXTERN int		TclUniCharMatch (CONST Tcl_UniChar * string, 
-				int strLen, CONST Tcl_UniChar * pattern, 
+EXTERN int		TclUniCharMatch (const Tcl_UniChar * string,
+				int strLen, const Tcl_UniChar * pattern,
 				int ptnLen, int flags);
 #endif
 /* Slot 174 is reserved */
 #ifndef TclCallVarTraces_TCL_DECLARED
 #define TclCallVarTraces_TCL_DECLARED
 /* 175 */
-EXTERN int		TclCallVarTraces (Interp * iPtr, Var * arrayPtr, 
-				Var * varPtr, CONST char * part1, 
-				CONST char * part2, int flags, 
+EXTERN int		TclCallVarTraces (Interp * iPtr, Var * arrayPtr,
+				Var * varPtr, const char * part1,
+				const char * part2, int flags,
 				int leaveErrMsg);
 #endif
 #ifndef TclCleanupVar_TCL_DECLARED
@@ -844,32 +844,32 @@ EXTERN void		TclCleanupVar (Var * varPtr, Var * arrayPtr);
 #ifndef TclVarErrMsg_TCL_DECLARED
 #define TclVarErrMsg_TCL_DECLARED
 /* 177 */
-EXTERN void		TclVarErrMsg (Tcl_Interp * interp, 
-				CONST char * part1, CONST char * part2, 
-				CONST char * operation, CONST char * reason);
+EXTERN void		TclVarErrMsg (Tcl_Interp * interp,
+				const char * part1, const char * part2,
+				const char * operation, const char * reason);
 #endif
 #ifndef Tcl_SetStartupScript_TCL_DECLARED
 #define Tcl_SetStartupScript_TCL_DECLARED
 /* 178 */
-EXTERN void		Tcl_SetStartupScript (Tcl_Obj * pathPtr, 
-				CONST char* encodingName);
+EXTERN void		Tcl_SetStartupScript (Tcl_Obj * pathPtr,
+				const char* encodingName);
 #endif
 #ifndef Tcl_GetStartupScript_TCL_DECLARED
 #define Tcl_GetStartupScript_TCL_DECLARED
 /* 179 */
-EXTERN Tcl_Obj *	Tcl_GetStartupScript (CONST char ** encodingNamePtr);
+EXTERN Tcl_Obj *	Tcl_GetStartupScript (const char ** encodingNamePtr);
 #endif
 /* Slot 180 is reserved */
 /* Slot 181 is reserved */
 #ifndef TclpLocaltime_TCL_DECLARED
 #define TclpLocaltime_TCL_DECLARED
 /* 182 */
-EXTERN struct tm *	TclpLocaltime (CONST time_t * clock);
+EXTERN struct tm *	TclpLocaltime (const time_t * clock);
 #endif
 #ifndef TclpGmtime_TCL_DECLARED
 #define TclpGmtime_TCL_DECLARED
 /* 183 */
-EXTERN struct tm *	TclpGmtime (CONST time_t * clock);
+EXTERN struct tm *	TclpGmtime (const time_t * clock);
 #endif
 /* Slot 184 is reserved */
 /* Slot 185 is reserved */
@@ -888,20 +888,20 @@ EXTERN struct tm *	TclpGmtime (CONST time_t * clock);
 #ifndef TclObjGetFrame_TCL_DECLARED
 #define TclObjGetFrame_TCL_DECLARED
 /* 198 */
-EXTERN int		TclObjGetFrame (Tcl_Interp * interp, 
+EXTERN int		TclObjGetFrame (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, CallFrame ** framePtrPtr);
 #endif
 /* Slot 199 is reserved */
 #ifndef TclpObjRemoveDirectory_TCL_DECLARED
 #define TclpObjRemoveDirectory_TCL_DECLARED
 /* 200 */
-EXTERN int		TclpObjRemoveDirectory (Tcl_Obj * pathPtr, 
+EXTERN int		TclpObjRemoveDirectory (Tcl_Obj * pathPtr,
 				int recursive, Tcl_Obj ** errorPtr);
 #endif
 #ifndef TclpObjCopyDirectory_TCL_DECLARED
 #define TclpObjCopyDirectory_TCL_DECLARED
 /* 201 */
-EXTERN int		TclpObjCopyDirectory (Tcl_Obj * srcPathPtr, 
+EXTERN int		TclpObjCopyDirectory (Tcl_Obj * srcPathPtr,
 				Tcl_Obj * destPathPtr, Tcl_Obj ** errorPtr);
 #endif
 #ifndef TclpObjCreateDirectory_TCL_DECLARED
@@ -917,13 +917,13 @@ EXTERN int		TclpObjDeleteFile (Tcl_Obj * pathPtr);
 #ifndef TclpObjCopyFile_TCL_DECLARED
 #define TclpObjCopyFile_TCL_DECLARED
 /* 204 */
-EXTERN int		TclpObjCopyFile (Tcl_Obj * srcPathPtr, 
+EXTERN int		TclpObjCopyFile (Tcl_Obj * srcPathPtr,
 				Tcl_Obj * destPathPtr);
 #endif
 #ifndef TclpObjRenameFile_TCL_DECLARED
 #define TclpObjRenameFile_TCL_DECLARED
 /* 205 */
-EXTERN int		TclpObjRenameFile (Tcl_Obj * srcPathPtr, 
+EXTERN int		TclpObjRenameFile (Tcl_Obj * srcPathPtr,
 				Tcl_Obj * destPathPtr);
 #endif
 #ifndef TclpObjStat_TCL_DECLARED
@@ -939,7 +939,7 @@ EXTERN int		TclpObjAccess (Tcl_Obj * pathPtr, int mode);
 #ifndef TclpOpenFileChannel_TCL_DECLARED
 #define TclpOpenFileChannel_TCL_DECLARED
 /* 208 */
-EXTERN Tcl_Channel	TclpOpenFileChannel (Tcl_Interp * interp, 
+EXTERN Tcl_Channel	TclpOpenFileChannel (Tcl_Interp * interp,
 				Tcl_Obj * pathPtr, int mode, int permissions);
 #endif
 /* Slot 209 is reserved */
@@ -948,7 +948,7 @@ EXTERN Tcl_Channel	TclpOpenFileChannel (Tcl_Interp * interp,
 #ifndef TclpFindExecutable_TCL_DECLARED
 #define TclpFindExecutable_TCL_DECLARED
 /* 212 */
-EXTERN void		TclpFindExecutable (CONST char * argv0);
+EXTERN void		TclpFindExecutable (const char * argv0);
 #endif
 #ifndef TclGetObjNameOfExecutable_TCL_DECLARED
 #define TclGetObjNameOfExecutable_TCL_DECLARED
@@ -958,7 +958,7 @@ EXTERN Tcl_Obj *	TclGetObjNameOfExecutable (void);
 #ifndef TclSetObjNameOfExecutable_TCL_DECLARED
 #define TclSetObjNameOfExecutable_TCL_DECLARED
 /* 214 */
-EXTERN void		TclSetObjNameOfExecutable (Tcl_Obj * name, 
+EXTERN void		TclSetObjNameOfExecutable (Tcl_Obj * name,
 				Tcl_Encoding encoding);
 #endif
 #ifndef TclStackAlloc_TCL_DECLARED
@@ -974,9 +974,9 @@ EXTERN void		TclStackFree (Tcl_Interp * interp, void * freePtr);
 #ifndef TclPushStackFrame_TCL_DECLARED
 #define TclPushStackFrame_TCL_DECLARED
 /* 217 */
-EXTERN int		TclPushStackFrame (Tcl_Interp * interp, 
-				Tcl_CallFrame ** framePtrPtr, 
-				Tcl_Namespace * namespacePtr, 
+EXTERN int		TclPushStackFrame (Tcl_Interp * interp,
+				Tcl_CallFrame ** framePtrPtr,
+				Tcl_Namespace * namespacePtr,
 				int isProcCallFrame);
 #endif
 #ifndef TclPopStackFrame_TCL_DECLARED
@@ -997,9 +997,9 @@ EXTERN TclPlatformType * TclGetPlatform (void);
 #ifndef TclTraceDictPath_TCL_DECLARED
 #define TclTraceDictPath_TCL_DECLARED
 /* 225 */
-EXTERN Tcl_Obj *	TclTraceDictPath (Tcl_Interp * interp, 
-				Tcl_Obj * rootPtr, int keyc, 
-				Tcl_Obj *CONST keyv[], int flags);
+EXTERN Tcl_Obj *	TclTraceDictPath (Tcl_Interp * interp,
+				Tcl_Obj * rootPtr, int keyc,
+				Tcl_Obj *const keyv[], int flags);
 #endif
 #ifndef TclObjBeingDeleted_TCL_DECLARED
 #define TclObjBeingDeleted_TCL_DECLARED
@@ -1009,37 +1009,37 @@ EXTERN int		TclObjBeingDeleted (Tcl_Obj * objPtr);
 #ifndef TclSetNsPath_TCL_DECLARED
 #define TclSetNsPath_TCL_DECLARED
 /* 227 */
-EXTERN void		TclSetNsPath (Namespace * nsPtr, int pathLength, 
+EXTERN void		TclSetNsPath (Namespace * nsPtr, int pathLength,
 				Tcl_Namespace * pathAry[]);
 #endif
 /* Slot 228 is reserved */
 #ifndef TclPtrMakeUpvar_TCL_DECLARED
 #define TclPtrMakeUpvar_TCL_DECLARED
 /* 229 */
-EXTERN int		TclPtrMakeUpvar (Tcl_Interp * interp, 
-				Var * otherP1Ptr, CONST char * myName, 
+EXTERN int		TclPtrMakeUpvar (Tcl_Interp * interp,
+				Var * otherP1Ptr, const char * myName,
 				int myFlags, int index);
 #endif
 #ifndef TclObjLookupVar_TCL_DECLARED
 #define TclObjLookupVar_TCL_DECLARED
 /* 230 */
-EXTERN Var *		TclObjLookupVar (Tcl_Interp * interp, 
-				Tcl_Obj * part1Ptr, CONST char * part2, 
-				int flags, CONST char * msg, 
-				CONST int createPart1, CONST int createPart2, 
+EXTERN Var *		TclObjLookupVar (Tcl_Interp * interp,
+				Tcl_Obj * part1Ptr, const char * part2,
+				int flags, const char * msg,
+				const int createPart1, const int createPart2,
 				Var ** arrayPtrPtr);
 #endif
 #ifndef TclGetNamespaceFromObj_TCL_DECLARED
 #define TclGetNamespaceFromObj_TCL_DECLARED
 /* 231 */
-EXTERN int		TclGetNamespaceFromObj (Tcl_Interp * interp, 
+EXTERN int		TclGetNamespaceFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, Tcl_Namespace ** nsPtrPtr);
 #endif
 #ifndef TclEvalObjEx_TCL_DECLARED
 #define TclEvalObjEx_TCL_DECLARED
 /* 232 */
-EXTERN int		TclEvalObjEx (Tcl_Interp * interp, Tcl_Obj * objPtr, 
-				int flags, CONST CmdFrame * invoker, 
+EXTERN int		TclEvalObjEx (Tcl_Interp * interp, Tcl_Obj * objPtr,
+				int flags, const CmdFrame * invoker,
 				int word);
 #endif
 #ifndef TclGetSrcInfoForPc_TCL_DECLARED
@@ -1050,19 +1050,19 @@ EXTERN void		TclGetSrcInfoForPc (CmdFrame * contextPtr);
 #ifndef TclVarHashCreateVar_TCL_DECLARED
 #define TclVarHashCreateVar_TCL_DECLARED
 /* 234 */
-EXTERN Var *		TclVarHashCreateVar (TclVarHashTable * tablePtr, 
-				CONST char * key, int * newPtr);
+EXTERN Var *		TclVarHashCreateVar (TclVarHashTable * tablePtr,
+				const char * key, int * newPtr);
 #endif
 #ifndef TclInitVarHashTable_TCL_DECLARED
 #define TclInitVarHashTable_TCL_DECLARED
 /* 235 */
-EXTERN void		TclInitVarHashTable (TclVarHashTable * tablePtr, 
+EXTERN void		TclInitVarHashTable (TclVarHashTable * tablePtr,
 				Namespace * nsPtr);
 #endif
 #ifndef TclBackgroundException_TCL_DECLARED
 #define TclBackgroundException_TCL_DECLARED
 /* 236 */
-EXTERN void		TclBackgroundException (Tcl_Interp * interp, 
+EXTERN void		TclBackgroundException (Tcl_Interp * interp,
 				int code);
 #endif
 #ifndef TclResetCancellation_TCL_DECLARED
@@ -1073,41 +1073,41 @@ EXTERN int		TclResetCancellation (Tcl_Interp * interp, int force);
 #ifndef TclNRInterpProc_TCL_DECLARED
 #define TclNRInterpProc_TCL_DECLARED
 /* 238 */
-EXTERN int		TclNRInterpProc (ClientData clientData, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[]);
+EXTERN int		TclNRInterpProc (ClientData clientData,
+				Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[]);
 #endif
 #ifndef TclNRInterpProcCore_TCL_DECLARED
 #define TclNRInterpProcCore_TCL_DECLARED
 /* 239 */
-EXTERN int		TclNRInterpProcCore (Tcl_Interp * interp, 
-				Tcl_Obj * procNameObj, int skip, 
+EXTERN int		TclNRInterpProcCore (Tcl_Interp * interp,
+				Tcl_Obj * procNameObj, int skip,
 				ProcErrorProc errorProc);
 #endif
 #ifndef TclNRRunCallbacks_TCL_DECLARED
 #define TclNRRunCallbacks_TCL_DECLARED
 /* 240 */
-EXTERN int		TclNRRunCallbacks (Tcl_Interp * interp, int result, 
+EXTERN int		TclNRRunCallbacks (Tcl_Interp * interp, int result,
 				struct TEOV_callback * rootPtr, int tebcCall);
 #endif
 #ifndef TclNREvalObjEx_TCL_DECLARED
 #define TclNREvalObjEx_TCL_DECLARED
 /* 241 */
-EXTERN int		TclNREvalObjEx (Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, int flags, 
-				CONST CmdFrame * invoker, int word);
+EXTERN int		TclNREvalObjEx (Tcl_Interp * interp,
+				Tcl_Obj * objPtr, int flags,
+				const CmdFrame * invoker, int word);
 #endif
 #ifndef TclNREvalObjv_TCL_DECLARED
 #define TclNREvalObjv_TCL_DECLARED
 /* 242 */
-EXTERN int		TclNREvalObjv (Tcl_Interp * interp, int objc, 
-				Tcl_Obj *const objv[], int flags, 
+EXTERN int		TclNREvalObjv (Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[], int flags,
 				Command * cmdPtr);
 #endif
 
 typedef struct TclIntStubs {
     int magic;
-    CONST struct TclIntStubHooks *hooks;
+    const struct TclIntStubHooks *hooks;
 
     void *reserved0;
     void *reserved1;
@@ -1124,18 +1124,18 @@ typedef struct TclIntStubs {
     int (*tclCleanupChildren) (Tcl_Interp * interp, int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan); /* 5 */
 #endif /* MACOSX */
     void (*tclCleanupCommand) (Command * cmdPtr); /* 6 */
-    int (*tclCopyAndCollapse) (int count, CONST char * src, char * dst); /* 7 */
+    int (*tclCopyAndCollapse) (int count, const char * src, char * dst); /* 7 */
     int (*tclCopyChannel) (Tcl_Interp * interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj * cmdPtr); /* 8 */
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
-    int (*tclCreatePipeline) (Tcl_Interp * interp, int argc, CONST char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr); /* 9 */
+    int (*tclCreatePipeline) (Tcl_Interp * interp, int argc, const char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr); /* 9 */
 #endif /* UNIX */
 #ifdef __WIN32__ /* WIN */
-    int (*tclCreatePipeline) (Tcl_Interp * interp, int argc, CONST char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr); /* 9 */
+    int (*tclCreatePipeline) (Tcl_Interp * interp, int argc, const char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr); /* 9 */
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
-    int (*tclCreatePipeline) (Tcl_Interp * interp, int argc, CONST char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr); /* 9 */
+    int (*tclCreatePipeline) (Tcl_Interp * interp, int argc, const char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr); /* 9 */
 #endif /* MACOSX */
-    int (*tclCreateProc) (Tcl_Interp * interp, Namespace * nsPtr, CONST char * procName, Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr, Proc ** procPtrPtr); /* 10 */
+    int (*tclCreateProc) (Tcl_Interp * interp, Namespace * nsPtr, const char * procName, Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr, Proc ** procPtrPtr); /* 10 */
     void (*tclDeleteCompiledLocalVars) (Interp * iPtr, CallFrame * framePtr); /* 11 */
     void (*tclDeleteVars) (Interp * iPtr, TclVarHashTable * tablePtr); /* 12 */
     void *reserved13;
@@ -1147,8 +1147,8 @@ typedef struct TclIntStubs {
     void *reserved19;
     void *reserved20;
     void *reserved21;
-    int (*tclFindElement) (Tcl_Interp * interp, CONST char * listStr, int listLength, CONST char ** elementPtr, CONST char ** nextPtr, int * sizePtr, int * bracePtr); /* 22 */
-    Proc * (*tclFindProc) (Interp * iPtr, CONST char * procName); /* 23 */
+    int (*tclFindElement) (Tcl_Interp * interp, const char * listStr, int listLength, const char ** elementPtr, const char ** nextPtr, int * sizePtr, int * bracePtr); /* 22 */
+    Proc * (*tclFindProc) (Interp * iPtr, const char * procName); /* 23 */
     void *reserved24;
     void (*tclFreePackageInfo) (Interp * iPtr); /* 25 */
     void *reserved26;
@@ -1156,20 +1156,20 @@ typedef struct TclIntStubs {
     Tcl_Channel (*tclpGetDefaultStdChannel) (int type); /* 28 */
     void *reserved29;
     void *reserved30;
-    CONST char * (*tclGetExtension) (CONST char * name); /* 31 */
-    int (*tclGetFrame) (Tcl_Interp * interp, CONST char * str, CallFrame ** framePtrPtr); /* 32 */
+    const char * (*tclGetExtension) (const char * name); /* 31 */
+    int (*tclGetFrame) (Tcl_Interp * interp, const char * str, CallFrame ** framePtrPtr); /* 32 */
     void *reserved33;
     int (*tclGetIntForIndex) (Tcl_Interp * interp, Tcl_Obj * objPtr, int endValue, int * indexPtr); /* 34 */
     void *reserved35;
     void *reserved36;
     int (*tclGetLoadedPackages) (Tcl_Interp * interp, char * targetName); /* 37 */
-    int (*tclGetNamespaceForQualName) (Tcl_Interp * interp, CONST char * qualName, Namespace * cxtNsPtr, int flags, Namespace ** nsPtrPtr, Namespace ** altNsPtrPtr, Namespace ** actualCxtPtrPtr, CONST char ** simpleNamePtr); /* 38 */
+    int (*tclGetNamespaceForQualName) (Tcl_Interp * interp, const char * qualName, Namespace * cxtNsPtr, int flags, Namespace ** nsPtrPtr, Namespace ** altNsPtrPtr, Namespace ** actualCxtPtrPtr, const char ** simpleNamePtr); /* 38 */
     TclObjCmdProcType (*tclGetObjInterpProc) (void); /* 39 */
-    int (*tclGetOpenMode) (Tcl_Interp * interp, CONST char * str, int * seekFlagPtr); /* 40 */
+    int (*tclGetOpenMode) (Tcl_Interp * interp, const char * str, int * seekFlagPtr); /* 40 */
     Tcl_Command (*tclGetOriginalCommand) (Tcl_Command command); /* 41 */
-    char * (*tclpGetUserHome) (CONST char * name, Tcl_DString * bufferPtr); /* 42 */
+    char * (*tclpGetUserHome) (const char * name, Tcl_DString * bufferPtr); /* 42 */
     void *reserved43;
-    int (*tclGuessPackageName) (CONST char * fileName, Tcl_DString * bufPtr); /* 44 */
+    int (*tclGuessPackageName) (const char * fileName, Tcl_DString * bufPtr); /* 44 */
     int (*tclHideUnsafeCommands) (Tcl_Interp * interp); /* 45 */
     int (*tclInExit) (void); /* 46 */
     void *reserved47;
@@ -1179,17 +1179,17 @@ typedef struct TclIntStubs {
     int (*tclInterpInit) (Tcl_Interp * interp); /* 51 */
     void *reserved52;
     int (*tclInvokeObjectCommand) (ClientData clientData, Tcl_Interp * interp, int argc, CONST84 char ** argv); /* 53 */
-    int (*tclInvokeStringCommand) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); /* 54 */
+    int (*tclInvokeStringCommand) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *const objv[]); /* 54 */
     Proc * (*tclIsProc) (Command * cmdPtr); /* 55 */
     void *reserved56;
     void *reserved57;
-    Var * (*tclLookupVar) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags, CONST char * msg, int createPart1, int createPart2, Var ** arrayPtrPtr); /* 58 */
+    Var * (*tclLookupVar) (Tcl_Interp * interp, const char * part1, const char * part2, int flags, const char * msg, int createPart1, int createPart2, Var ** arrayPtrPtr); /* 58 */
     void *reserved59;
-    int (*tclNeedSpace) (CONST char * start, CONST char * end); /* 60 */
+    int (*tclNeedSpace) (const char * start, const char * end); /* 60 */
     Tcl_Obj * (*tclNewProcBodyObj) (Proc * procPtr); /* 61 */
     int (*tclObjCommandComplete) (Tcl_Obj * cmdPtr); /* 62 */
-    int (*tclObjInterpProc) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); /* 63 */
-    int (*tclObjInvoke) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 64 */
+    int (*tclObjInterpProc) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *const objv[]); /* 63 */
+    int (*tclObjInvoke) (Tcl_Interp * interp, int objc, Tcl_Obj *const objv[], int flags); /* 64 */
     void *reserved65;
     void *reserved66;
     void *reserved67;
@@ -1213,22 +1213,22 @@ typedef struct TclIntStubs {
     void *reserved85;
     void *reserved86;
     void *reserved87;
-    char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp * interp, CONST char * name1, CONST char * name2, int flags); /* 88 */
+    char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp * interp, const char * name1, const char * name2, int flags); /* 88 */
     int (*tclPreventAliasLoop) (Tcl_Interp * interp, Tcl_Interp * cmdInterp, Tcl_Command cmd); /* 89 */
     void *reserved90;
     void (*tclProcCleanupProc) (Proc * procPtr); /* 91 */
-    int (*tclProcCompileProc) (Tcl_Interp * interp, Proc * procPtr, Tcl_Obj * bodyPtr, Namespace * nsPtr, CONST char * description, CONST char * procName); /* 92 */
+    int (*tclProcCompileProc) (Tcl_Interp * interp, Proc * procPtr, Tcl_Obj * bodyPtr, Namespace * nsPtr, const char * description, const char * procName); /* 92 */
     void (*tclProcDeleteProc) (ClientData clientData); /* 93 */
     void *reserved94;
     void *reserved95;
-    int (*tclRenameCommand) (Tcl_Interp * interp, CONST char * oldName, CONST char * newName); /* 96 */
+    int (*tclRenameCommand) (Tcl_Interp * interp, const char * oldName, const char * newName); /* 96 */
     void (*tclResetShadowedCmdRefs) (Tcl_Interp * interp, Command * newCmdPtr); /* 97 */
     int (*tclServiceIdle) (void); /* 98 */
     void *reserved99;
     void *reserved100;
     char * (*tclSetPreInitScript) (char * string); /* 101 */
     void (*tclSetupEnv) (Tcl_Interp * interp); /* 102 */
-    int (*tclSockGetPort) (Tcl_Interp * interp, CONST char * str, CONST char * proto, int * portPtr); /* 103 */
+    int (*tclSockGetPort) (Tcl_Interp * interp, const char * str, const char * proto, int * portPtr); /* 103 */
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
     int (*tclSockMinimumBuffers) (int sock, int size); /* 104 */
 #endif /* UNIX */
@@ -1244,41 +1244,41 @@ typedef struct TclIntStubs {
     void (*tclTeardownNamespace) (Namespace * nsPtr); /* 108 */
     int (*tclUpdateReturnInfo) (Interp * iPtr); /* 109 */
     void *reserved110;
-    void (*tcl_AddInterpResolvers) (Tcl_Interp * interp, CONST char * name, Tcl_ResolveCmdProc * cmdProc, Tcl_ResolveVarProc * varProc, Tcl_ResolveCompiledVarProc * compiledVarProc); /* 111 */
+    void (*tcl_AddInterpResolvers) (Tcl_Interp * interp, const char * name, Tcl_ResolveCmdProc * cmdProc, Tcl_ResolveVarProc * varProc, Tcl_ResolveCompiledVarProc * compiledVarProc); /* 111 */
     int (*tcl_AppendExportList) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, Tcl_Obj * objPtr); /* 112 */
-    Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp * interp, CONST char * name, ClientData clientData, Tcl_NamespaceDeleteProc * deleteProc); /* 113 */
+    Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp * interp, const char * name, ClientData clientData, Tcl_NamespaceDeleteProc * deleteProc); /* 113 */
     void (*tcl_DeleteNamespace) (Tcl_Namespace * nsPtr); /* 114 */
-    int (*tcl_Export) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern, int resetListFirst); /* 115 */
-    Tcl_Command (*tcl_FindCommand) (Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags); /* 116 */
-    Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags); /* 117 */
-    int (*tcl_GetInterpResolvers) (Tcl_Interp * interp, CONST char * name, Tcl_ResolverInfo * resInfo); /* 118 */
+    int (*tcl_Export) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, const char * pattern, int resetListFirst); /* 115 */
+    Tcl_Command (*tcl_FindCommand) (Tcl_Interp * interp, const char * name, Tcl_Namespace * contextNsPtr, int flags); /* 116 */
+    Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp * interp, const char * name, Tcl_Namespace * contextNsPtr, int flags); /* 117 */
+    int (*tcl_GetInterpResolvers) (Tcl_Interp * interp, const char * name, Tcl_ResolverInfo * resInfo); /* 118 */
     int (*tcl_GetNamespaceResolvers) (Tcl_Namespace * namespacePtr, Tcl_ResolverInfo * resInfo); /* 119 */
-    Tcl_Var (*tcl_FindNamespaceVar) (Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags); /* 120 */
-    int (*tcl_ForgetImport) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern); /* 121 */
+    Tcl_Var (*tcl_FindNamespaceVar) (Tcl_Interp * interp, const char * name, Tcl_Namespace * contextNsPtr, int flags); /* 120 */
+    int (*tcl_ForgetImport) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, const char * pattern); /* 121 */
     Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 122 */
     void (*tcl_GetCommandFullName) (Tcl_Interp * interp, Tcl_Command command, Tcl_Obj * objPtr); /* 123 */
     Tcl_Namespace * (*tcl_GetCurrentNamespace) (Tcl_Interp * interp); /* 124 */
     Tcl_Namespace * (*tcl_GetGlobalNamespace) (Tcl_Interp * interp); /* 125 */
     void (*tcl_GetVariableFullName) (Tcl_Interp * interp, Tcl_Var variable, Tcl_Obj * objPtr); /* 126 */
-    int (*tcl_Import) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern, int allowOverwrite); /* 127 */
+    int (*tcl_Import) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, const char * pattern, int allowOverwrite); /* 127 */
     void (*tcl_PopCallFrame) (Tcl_Interp * interp); /* 128 */
     int (*tcl_PushCallFrame) (Tcl_Interp * interp, Tcl_CallFrame * framePtr, Tcl_Namespace * nsPtr, int isProcCallFrame); /* 129 */
-    int (*tcl_RemoveInterpResolvers) (Tcl_Interp * interp, CONST char * name); /* 130 */
+    int (*tcl_RemoveInterpResolvers) (Tcl_Interp * interp, const char * name); /* 130 */
     void (*tcl_SetNamespaceResolvers) (Tcl_Namespace * namespacePtr, Tcl_ResolveCmdProc * cmdProc, Tcl_ResolveVarProc * varProc, Tcl_ResolveCompiledVarProc * compiledVarProc); /* 131 */
     int (*tclpHasSockets) (Tcl_Interp * interp); /* 132 */
-    struct tm * (*tclpGetDate) (CONST time_t * time, int useGMT); /* 133 */
+    struct tm * (*tclpGetDate) (const time_t * time, int useGMT); /* 133 */
     void *reserved134;
     void *reserved135;
     void *reserved136;
     void *reserved137;
-    CONST84_RETURN char * (*tclGetEnv) (CONST char * name, Tcl_DString * valuePtr); /* 138 */
+    CONST84_RETURN char * (*tclGetEnv) (const char * name, Tcl_DString * valuePtr); /* 138 */
     void *reserved139;
     void *reserved140;
     CONST84_RETURN char * (*tclpGetCwd) (Tcl_Interp * interp, Tcl_DString * cwdPtr); /* 141 */
     int (*tclSetByteCodeFromAny) (Tcl_Interp * interp, Tcl_Obj * objPtr, CompileHookProc * hookProc, ClientData clientData); /* 142 */
     int (*tclAddLiteralObj) (struct CompileEnv * envPtr, Tcl_Obj * objPtr, LiteralEntry ** litPtrPtr); /* 143 */
     void (*tclHideLiteral) (Tcl_Interp * interp, struct CompileEnv * envPtr, int index); /* 144 */
-    CONST86 struct AuxDataType * (*tclGetAuxDataType) (CONST char * typeName); /* 145 */
+    CONST86 struct AuxDataType * (*tclGetAuxDataType) (const char * typeName); /* 145 */
     TclHandle (*tclHandleCreate) (VOID * ptr); /* 146 */
     void (*tclHandleFree) (TclHandle handle); /* 147 */
     TclHandle (*tclHandlePreserve) (TclHandle handle); /* 148 */
@@ -1289,9 +1289,9 @@ typedef struct TclIntStubs {
     Tcl_Obj * (*tclGetLibraryPath) (void); /* 153 */
     void *reserved154;
     void *reserved155;
-    void (*tclRegError) (Tcl_Interp * interp, CONST char * msg, int status); /* 156 */
-    Var * (*tclVarTraceExists) (Tcl_Interp * interp, CONST char * varName); /* 157 */
-    void (*tclSetStartupScriptFileName) (CONST char * filename); /* 158 */
+    void (*tclRegError) (Tcl_Interp * interp, const char * msg, int status); /* 156 */
+    Var * (*tclVarTraceExists) (Tcl_Interp * interp, const char * varName); /* 157 */
+    void (*tclSetStartupScriptFileName) (const char * filename); /* 158 */
     CONST84_RETURN char * (*tclGetStartupScriptFileName) (void); /* 159 */
     void *reserved160;
     int (*tclChannelTransform) (Tcl_Interp * interp, Tcl_Channel chan, Tcl_Obj * cmdObjPtr); /* 161 */
@@ -1302,21 +1302,21 @@ typedef struct TclIntStubs {
     int (*tclListObjSetElement) (Tcl_Interp * interp, Tcl_Obj * listPtr, int index, Tcl_Obj * valuePtr); /* 166 */
     void (*tclSetStartupScriptPath) (Tcl_Obj * pathPtr); /* 167 */
     Tcl_Obj * (*tclGetStartupScriptPath) (void); /* 168 */
-    int (*tclpUtfNcmp2) (CONST char * s1, CONST char * s2, unsigned long n); /* 169 */
-    int (*tclCheckInterpTraces) (Tcl_Interp * interp, CONST char * command, int numChars, Command * cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *CONST objv[]); /* 170 */
-    int (*tclCheckExecutionTraces) (Tcl_Interp * interp, CONST char * command, int numChars, Command * cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *CONST objv[]); /* 171 */
+    int (*tclpUtfNcmp2) (const char * s1, const char * s2, unsigned long n); /* 169 */
+    int (*tclCheckInterpTraces) (Tcl_Interp * interp, const char * command, int numChars, Command * cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *const objv[]); /* 170 */
+    int (*tclCheckExecutionTraces) (Tcl_Interp * interp, const char * command, int numChars, Command * cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *const objv[]); /* 171 */
     int (*tclInThreadExit) (void); /* 172 */
-    int (*tclUniCharMatch) (CONST Tcl_UniChar * string, int strLen, CONST Tcl_UniChar * pattern, int ptnLen, int flags); /* 173 */
+    int (*tclUniCharMatch) (const Tcl_UniChar * string, int strLen, const Tcl_UniChar * pattern, int ptnLen, int flags); /* 173 */
     void *reserved174;
-    int (*tclCallVarTraces) (Interp * iPtr, Var * arrayPtr, Var * varPtr, CONST char * part1, CONST char * part2, int flags, int leaveErrMsg); /* 175 */
+    int (*tclCallVarTraces) (Interp * iPtr, Var * arrayPtr, Var * varPtr, const char * part1, const char * part2, int flags, int leaveErrMsg); /* 175 */
     void (*tclCleanupVar) (Var * varPtr, Var * arrayPtr); /* 176 */
-    void (*tclVarErrMsg) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, CONST char * operation, CONST char * reason); /* 177 */
-    void (*tcl_SetStartupScript) (Tcl_Obj * pathPtr, CONST char* encodingName); /* 178 */
-    Tcl_Obj * (*tcl_GetStartupScript) (CONST char ** encodingNamePtr); /* 179 */
+    void (*tclVarErrMsg) (Tcl_Interp * interp, const char * part1, const char * part2, const char * operation, const char * reason); /* 177 */
+    void (*tcl_SetStartupScript) (Tcl_Obj * pathPtr, const char* encodingName); /* 178 */
+    Tcl_Obj * (*tcl_GetStartupScript) (const char ** encodingNamePtr); /* 179 */
     void *reserved180;
     void *reserved181;
-    struct tm * (*tclpLocaltime) (CONST time_t * clock); /* 182 */
-    struct tm * (*tclpGmtime) (CONST time_t * clock); /* 183 */
+    struct tm * (*tclpLocaltime) (const time_t * clock); /* 182 */
+    struct tm * (*tclpGmtime) (const time_t * clock); /* 183 */
     void *reserved184;
     void *reserved185;
     void *reserved186;
@@ -1345,7 +1345,7 @@ typedef struct TclIntStubs {
     void *reserved209;
     void *reserved210;
     void *reserved211;
-    void (*tclpFindExecutable) (CONST char * argv0); /* 212 */
+    void (*tclpFindExecutable) (const char * argv0); /* 212 */
     Tcl_Obj * (*tclGetObjNameOfExecutable) (void); /* 213 */
     void (*tclSetObjNameOfExecutable) (Tcl_Obj * name, Tcl_Encoding encoding); /* 214 */
     void * (*tclStackAlloc) (Tcl_Interp * interp, int numBytes); /* 215 */
@@ -1358,28 +1358,28 @@ typedef struct TclIntStubs {
     void *reserved222;
     void *reserved223;
     TclPlatformType * (*tclGetPlatform) (void); /* 224 */
-    Tcl_Obj * (*tclTraceDictPath) (Tcl_Interp * interp, Tcl_Obj * rootPtr, int keyc, Tcl_Obj *CONST keyv[], int flags); /* 225 */
+    Tcl_Obj * (*tclTraceDictPath) (Tcl_Interp * interp, Tcl_Obj * rootPtr, int keyc, Tcl_Obj *const keyv[], int flags); /* 225 */
     int (*tclObjBeingDeleted) (Tcl_Obj * objPtr); /* 226 */
     void (*tclSetNsPath) (Namespace * nsPtr, int pathLength, Tcl_Namespace * pathAry[]); /* 227 */
     void *reserved228;
-    int (*tclPtrMakeUpvar) (Tcl_Interp * interp, Var * otherP1Ptr, CONST char * myName, int myFlags, int index); /* 229 */
-    Var * (*tclObjLookupVar) (Tcl_Interp * interp, Tcl_Obj * part1Ptr, CONST char * part2, int flags, CONST char * msg, CONST int createPart1, CONST int createPart2, Var ** arrayPtrPtr); /* 230 */
+    int (*tclPtrMakeUpvar) (Tcl_Interp * interp, Var * otherP1Ptr, const char * myName, int myFlags, int index); /* 229 */
+    Var * (*tclObjLookupVar) (Tcl_Interp * interp, Tcl_Obj * part1Ptr, const char * part2, int flags, const char * msg, const int createPart1, const int createPart2, Var ** arrayPtrPtr); /* 230 */
     int (*tclGetNamespaceFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, Tcl_Namespace ** nsPtrPtr); /* 231 */
-    int (*tclEvalObjEx) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags, CONST CmdFrame * invoker, int word); /* 232 */
+    int (*tclEvalObjEx) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags, const CmdFrame * invoker, int word); /* 232 */
     void (*tclGetSrcInfoForPc) (CmdFrame * contextPtr); /* 233 */
-    Var * (*tclVarHashCreateVar) (TclVarHashTable * tablePtr, CONST char * key, int * newPtr); /* 234 */
+    Var * (*tclVarHashCreateVar) (TclVarHashTable * tablePtr, const char * key, int * newPtr); /* 234 */
     void (*tclInitVarHashTable) (TclVarHashTable * tablePtr, Namespace * nsPtr); /* 235 */
     void (*tclBackgroundException) (Tcl_Interp * interp, int code); /* 236 */
     int (*tclResetCancellation) (Tcl_Interp * interp, int force); /* 237 */
-    int (*tclNRInterpProc) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); /* 238 */
+    int (*tclNRInterpProc) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *const objv[]); /* 238 */
     int (*tclNRInterpProcCore) (Tcl_Interp * interp, Tcl_Obj * procNameObj, int skip, ProcErrorProc errorProc); /* 239 */
     int (*tclNRRunCallbacks) (Tcl_Interp * interp, int result, struct TEOV_callback * rootPtr, int tebcCall); /* 240 */
-    int (*tclNREvalObjEx) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags, CONST CmdFrame * invoker, int word); /* 241 */
+    int (*tclNREvalObjEx) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags, const CmdFrame * invoker, int word); /* 241 */
     int (*tclNREvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *const objv[], int flags, Command * cmdPtr); /* 242 */
 } TclIntStubs;
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-extern CONST TclIntStubs *tclIntStubsPtr;
+extern const TclIntStubs *tclIntStubsPtr;
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 2ca2b2c..35c7e52 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.37 2008/07/22 23:01:37 das Exp $
+ * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.38 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 #ifndef _TCLINTPLATDECLS
@@ -42,7 +42,7 @@
 #ifndef TclGetAndDetachPids_TCL_DECLARED
 #define TclGetAndDetachPids_TCL_DECLARED
 /* 0 */
-EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp, 
+EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp,
 				Tcl_Channel chan);
 #endif
 #ifndef TclpCloseFile_TCL_DECLARED
@@ -53,22 +53,22 @@ EXTERN int		TclpCloseFile (TclFile file);
 #ifndef TclpCreateCommandChannel_TCL_DECLARED
 #define TclpCreateCommandChannel_TCL_DECLARED
 /* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile, 
-				TclFile writeFile, TclFile errorFile, 
+EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile,
+				TclFile writeFile, TclFile errorFile,
 				int numPids, Tcl_Pid * pidPtr);
 #endif
 #ifndef TclpCreatePipe_TCL_DECLARED
 #define TclpCreatePipe_TCL_DECLARED
 /* 3 */
-EXTERN int		TclpCreatePipe (TclFile * readPipe, 
+EXTERN int		TclpCreatePipe (TclFile * readPipe,
 				TclFile * writePipe);
 #endif
 #ifndef TclpCreateProcess_TCL_DECLARED
 #define TclpCreateProcess_TCL_DECLARED
 /* 4 */
-EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc, 
-				CONST char ** argv, TclFile inputFile, 
-				TclFile outputFile, TclFile errorFile, 
+EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc,
+				const char ** argv, TclFile inputFile,
+				TclFile outputFile, TclFile errorFile,
 				Tcl_Pid * pidPtr);
 #endif
 /* Slot 5 is reserved */
@@ -80,7 +80,7 @@ EXTERN TclFile		TclpMakeFile (Tcl_Channel channel, int direction);
 #ifndef TclpOpenFile_TCL_DECLARED
 #define TclpOpenFile_TCL_DECLARED
 /* 7 */
-EXTERN TclFile		TclpOpenFile (CONST char * fname, int mode);
+EXTERN TclFile		TclpOpenFile (const char * fname, int mode);
 #endif
 #ifndef TclUnixWaitForFile_TCL_DECLARED
 #define TclUnixWaitForFile_TCL_DECLARED
@@ -90,7 +90,7 @@ EXTERN int		TclUnixWaitForFile (int fd, int mask, int timeout);
 #ifndef TclpCreateTempFile_TCL_DECLARED
 #define TclpCreateTempFile_TCL_DECLARED
 /* 9 */
-EXTERN TclFile		TclpCreateTempFile (CONST char * contents);
+EXTERN TclFile		TclpCreateTempFile (const char * contents);
 #endif
 #ifndef TclpReaddir_TCL_DECLARED
 #define TclpReaddir_TCL_DECLARED
@@ -100,12 +100,12 @@ EXTERN Tcl_DirEntry *	TclpReaddir (DIR * dir);
 #ifndef TclpLocaltime_unix_TCL_DECLARED
 #define TclpLocaltime_unix_TCL_DECLARED
 /* 11 */
-EXTERN struct tm *	TclpLocaltime_unix (CONST time_t * clock);
+EXTERN struct tm *	TclpLocaltime_unix (const time_t * clock);
 #endif
 #ifndef TclpGmtime_unix_TCL_DECLARED
 #define TclpGmtime_unix_TCL_DECLARED
 /* 12 */
-EXTERN struct tm *	TclpGmtime_unix (CONST time_t * clock);
+EXTERN struct tm *	TclpGmtime_unix (const time_t * clock);
 #endif
 #ifndef TclpInetNtoa_TCL_DECLARED
 #define TclpInetNtoa_TCL_DECLARED
@@ -115,8 +115,8 @@ EXTERN char *		TclpInetNtoa (struct in_addr addr);
 #ifndef TclUnixCopyFile_TCL_DECLARED
 #define TclUnixCopyFile_TCL_DECLARED
 /* 14 */
-EXTERN int		TclUnixCopyFile (CONST char * src, CONST char * dst, 
-				CONST Tcl_StatBuf * statBufPtr, 
+EXTERN int		TclUnixCopyFile (const char * src, const char * dst,
+				const Tcl_StatBuf * statBufPtr,
 				int dontCopyAtts);
 #endif
 #endif /* UNIX */
@@ -134,13 +134,13 @@ EXTERN void		TclWinConvertWSAError (DWORD errCode);
 #ifndef TclWinGetServByName_TCL_DECLARED
 #define TclWinGetServByName_TCL_DECLARED
 /* 2 */
-EXTERN struct servent *	 TclWinGetServByName (CONST char * nm, 
-				CONST char * proto);
+EXTERN struct servent *	 TclWinGetServByName (const char * nm,
+				const char * proto);
 #endif
 #ifndef TclWinGetSockOpt_TCL_DECLARED
 #define TclWinGetSockOpt_TCL_DECLARED
 /* 3 */
-EXTERN int		TclWinGetSockOpt (int s, int level, int optname, 
+EXTERN int		TclWinGetSockOpt (int s, int level, int optname,
 				char FAR * optval, int FAR * optlen);
 #endif
 #ifndef TclWinGetTclInstance_TCL_DECLARED
@@ -157,8 +157,8 @@ EXTERN u_short		TclWinNToHS (u_short ns);
 #ifndef TclWinSetSockOpt_TCL_DECLARED
 #define TclWinSetSockOpt_TCL_DECLARED
 /* 7 */
-EXTERN int		TclWinSetSockOpt (int s, int level, int optname, 
-				CONST char FAR * optval, int optlen);
+EXTERN int		TclWinSetSockOpt (int s, int level, int optname,
+				const char FAR * optval, int optlen);
 #endif
 #ifndef TclpGetPid_TCL_DECLARED
 #define TclpGetPid_TCL_DECLARED
@@ -174,7 +174,7 @@ EXTERN int		TclWinGetPlatformId (void);
 #ifndef TclGetAndDetachPids_TCL_DECLARED
 #define TclGetAndDetachPids_TCL_DECLARED
 /* 11 */
-EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp, 
+EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp,
 				Tcl_Channel chan);
 #endif
 #ifndef TclpCloseFile_TCL_DECLARED
@@ -185,22 +185,22 @@ EXTERN int		TclpCloseFile (TclFile file);
 #ifndef TclpCreateCommandChannel_TCL_DECLARED
 #define TclpCreateCommandChannel_TCL_DECLARED
 /* 13 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile, 
-				TclFile writeFile, TclFile errorFile, 
+EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile,
+				TclFile writeFile, TclFile errorFile,
 				int numPids, Tcl_Pid * pidPtr);
 #endif
 #ifndef TclpCreatePipe_TCL_DECLARED
 #define TclpCreatePipe_TCL_DECLARED
 /* 14 */
-EXTERN int		TclpCreatePipe (TclFile * readPipe, 
+EXTERN int		TclpCreatePipe (TclFile * readPipe,
 				TclFile * writePipe);
 #endif
 #ifndef TclpCreateProcess_TCL_DECLARED
 #define TclpCreateProcess_TCL_DECLARED
 /* 15 */
-EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc, 
-				CONST char ** argv, TclFile inputFile, 
-				TclFile outputFile, TclFile errorFile, 
+EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc,
+				const char ** argv, TclFile inputFile,
+				TclFile outputFile, TclFile errorFile,
 				Tcl_Pid * pidPtr);
 #endif
 /* Slot 16 is reserved */
@@ -213,7 +213,7 @@ EXTERN TclFile		TclpMakeFile (Tcl_Channel channel, int direction);
 #ifndef TclpOpenFile_TCL_DECLARED
 #define TclpOpenFile_TCL_DECLARED
 /* 19 */
-EXTERN TclFile		TclpOpenFile (CONST char * fname, int mode);
+EXTERN TclFile		TclpOpenFile (const char * fname, int mode);
 #endif
 #ifndef TclWinAddProcess_TCL_DECLARED
 #define TclWinAddProcess_TCL_DECLARED
@@ -224,7 +224,7 @@ EXTERN void		TclWinAddProcess (HANDLE hProcess, DWORD id);
 #ifndef TclpCreateTempFile_TCL_DECLARED
 #define TclpCreateTempFile_TCL_DECLARED
 /* 22 */
-EXTERN TclFile		TclpCreateTempFile (CONST char * contents);
+EXTERN TclFile		TclpCreateTempFile (const char * contents);
 #endif
 #ifndef TclpGetTZName_TCL_DECLARED
 #define TclpGetTZName_TCL_DECLARED
@@ -262,7 +262,7 @@ EXTERN int		TclWinCPUID (unsigned int index, unsigned int * regs);
 #ifndef TclGetAndDetachPids_TCL_DECLARED
 #define TclGetAndDetachPids_TCL_DECLARED
 /* 0 */
-EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp, 
+EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp,
 				Tcl_Channel chan);
 #endif
 #ifndef TclpCloseFile_TCL_DECLARED
@@ -273,22 +273,22 @@ EXTERN int		TclpCloseFile (TclFile file);
 #ifndef TclpCreateCommandChannel_TCL_DECLARED
 #define TclpCreateCommandChannel_TCL_DECLARED
 /* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile, 
-				TclFile writeFile, TclFile errorFile, 
+EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile,
+				TclFile writeFile, TclFile errorFile,
 				int numPids, Tcl_Pid * pidPtr);
 #endif
 #ifndef TclpCreatePipe_TCL_DECLARED
 #define TclpCreatePipe_TCL_DECLARED
 /* 3 */
-EXTERN int		TclpCreatePipe (TclFile * readPipe, 
+EXTERN int		TclpCreatePipe (TclFile * readPipe,
 				TclFile * writePipe);
 #endif
 #ifndef TclpCreateProcess_TCL_DECLARED
 #define TclpCreateProcess_TCL_DECLARED
 /* 4 */
-EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc, 
-				CONST char ** argv, TclFile inputFile, 
-				TclFile outputFile, TclFile errorFile, 
+EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc,
+				const char ** argv, TclFile inputFile,
+				TclFile outputFile, TclFile errorFile,
 				Tcl_Pid * pidPtr);
 #endif
 /* Slot 5 is reserved */
@@ -300,7 +300,7 @@ EXTERN TclFile		TclpMakeFile (Tcl_Channel channel, int direction);
 #ifndef TclpOpenFile_TCL_DECLARED
 #define TclpOpenFile_TCL_DECLARED
 /* 7 */
-EXTERN TclFile		TclpOpenFile (CONST char * fname, int mode);
+EXTERN TclFile		TclpOpenFile (const char * fname, int mode);
 #endif
 #ifndef TclUnixWaitForFile_TCL_DECLARED
 #define TclUnixWaitForFile_TCL_DECLARED
@@ -310,7 +310,7 @@ EXTERN int		TclUnixWaitForFile (int fd, int mask, int timeout);
 #ifndef TclpCreateTempFile_TCL_DECLARED
 #define TclpCreateTempFile_TCL_DECLARED
 /* 9 */
-EXTERN TclFile		TclpCreateTempFile (CONST char * contents);
+EXTERN TclFile		TclpCreateTempFile (const char * contents);
 #endif
 #ifndef TclpReaddir_TCL_DECLARED
 #define TclpReaddir_TCL_DECLARED
@@ -320,12 +320,12 @@ EXTERN Tcl_DirEntry *	TclpReaddir (DIR * dir);
 #ifndef TclpLocaltime_unix_TCL_DECLARED
 #define TclpLocaltime_unix_TCL_DECLARED
 /* 11 */
-EXTERN struct tm *	TclpLocaltime_unix (CONST time_t * clock);
+EXTERN struct tm *	TclpLocaltime_unix (const time_t * clock);
 #endif
 #ifndef TclpGmtime_unix_TCL_DECLARED
 #define TclpGmtime_unix_TCL_DECLARED
 /* 12 */
-EXTERN struct tm *	TclpGmtime_unix (CONST time_t * clock);
+EXTERN struct tm *	TclpGmtime_unix (const time_t * clock);
 #endif
 #ifndef TclpInetNtoa_TCL_DECLARED
 #define TclpInetNtoa_TCL_DECLARED
@@ -335,71 +335,71 @@ EXTERN char *		TclpInetNtoa (struct in_addr addr);
 #ifndef TclUnixCopyFile_TCL_DECLARED
 #define TclUnixCopyFile_TCL_DECLARED
 /* 14 */
-EXTERN int		TclUnixCopyFile (CONST char * src, CONST char * dst, 
-				CONST Tcl_StatBuf * statBufPtr, 
+EXTERN int		TclUnixCopyFile (const char * src, const char * dst,
+				const Tcl_StatBuf * statBufPtr,
 				int dontCopyAtts);
 #endif
 #ifndef TclMacOSXGetFileAttribute_TCL_DECLARED
 #define TclMacOSXGetFileAttribute_TCL_DECLARED
 /* 15 */
-EXTERN int		TclMacOSXGetFileAttribute (Tcl_Interp * interp, 
-				int objIndex, Tcl_Obj * fileName, 
+EXTERN int		TclMacOSXGetFileAttribute (Tcl_Interp * interp,
+				int objIndex, Tcl_Obj * fileName,
 				Tcl_Obj ** attributePtrPtr);
 #endif
 #ifndef TclMacOSXSetFileAttribute_TCL_DECLARED
 #define TclMacOSXSetFileAttribute_TCL_DECLARED
 /* 16 */
-EXTERN int		TclMacOSXSetFileAttribute (Tcl_Interp * interp, 
-				int objIndex, Tcl_Obj * fileName, 
+EXTERN int		TclMacOSXSetFileAttribute (Tcl_Interp * interp,
+				int objIndex, Tcl_Obj * fileName,
 				Tcl_Obj * attributePtr);
 #endif
 #ifndef TclMacOSXCopyFileAttributes_TCL_DECLARED
 #define TclMacOSXCopyFileAttributes_TCL_DECLARED
 /* 17 */
-EXTERN int		TclMacOSXCopyFileAttributes (CONST char * src, 
-				CONST char * dst, 
-				CONST Tcl_StatBuf * statBufPtr);
+EXTERN int		TclMacOSXCopyFileAttributes (const char * src,
+				const char * dst,
+				const Tcl_StatBuf * statBufPtr);
 #endif
 #ifndef TclMacOSXMatchType_TCL_DECLARED
 #define TclMacOSXMatchType_TCL_DECLARED
 /* 18 */
-EXTERN int		TclMacOSXMatchType (Tcl_Interp * interp, 
-				CONST char * pathName, CONST char * fileName, 
-				Tcl_StatBuf * statBufPtr, 
+EXTERN int		TclMacOSXMatchType (Tcl_Interp * interp,
+				const char * pathName, const char * fileName,
+				Tcl_StatBuf * statBufPtr,
 				Tcl_GlobTypeData * types);
 #endif
 #endif /* MACOSX */
 
 typedef struct TclIntPlatStubs {
     int magic;
-    CONST struct TclIntPlatStubHooks *hooks;
+    const struct TclIntPlatStubHooks *hooks;
 
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
     void (*tclGetAndDetachPids) (Tcl_Interp * interp, Tcl_Channel chan); /* 0 */
     int (*tclpCloseFile) (TclFile file); /* 1 */
     Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr); /* 2 */
     int (*tclpCreatePipe) (TclFile * readPipe, TclFile * writePipe); /* 3 */
-    int (*tclpCreateProcess) (Tcl_Interp * interp, int argc, CONST char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr); /* 4 */
+    int (*tclpCreateProcess) (Tcl_Interp * interp, int argc, const char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr); /* 4 */
     void *reserved5;
     TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 6 */
-    TclFile (*tclpOpenFile) (CONST char * fname, int mode); /* 7 */
+    TclFile (*tclpOpenFile) (const char * fname, int mode); /* 7 */
     int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
-    TclFile (*tclpCreateTempFile) (CONST char * contents); /* 9 */
+    TclFile (*tclpCreateTempFile) (const char * contents); /* 9 */
     Tcl_DirEntry * (*tclpReaddir) (DIR * dir); /* 10 */
-    struct tm * (*tclpLocaltime_unix) (CONST time_t * clock); /* 11 */
-    struct tm * (*tclpGmtime_unix) (CONST time_t * clock); /* 12 */
+    struct tm * (*tclpLocaltime_unix) (const time_t * clock); /* 11 */
+    struct tm * (*tclpGmtime_unix) (const time_t * clock); /* 12 */
     char * (*tclpInetNtoa) (struct in_addr addr); /* 13 */
-    int (*tclUnixCopyFile) (CONST char * src, CONST char * dst, CONST Tcl_StatBuf * statBufPtr, int dontCopyAtts); /* 14 */
+    int (*tclUnixCopyFile) (const char * src, const char * dst, const Tcl_StatBuf * statBufPtr, int dontCopyAtts); /* 14 */
 #endif /* UNIX */
 #ifdef __WIN32__ /* WIN */
     void (*tclWinConvertError) (DWORD errCode); /* 0 */
     void (*tclWinConvertWSAError) (DWORD errCode); /* 1 */
-    struct servent * (*tclWinGetServByName) (CONST char * nm, CONST char * proto); /* 2 */
+    struct servent * (*tclWinGetServByName) (const char * nm, const char * proto); /* 2 */
     int (*tclWinGetSockOpt) (int s, int level, int optname, char FAR * optval, int FAR * optlen); /* 3 */
     HINSTANCE (*tclWinGetTclInstance) (void); /* 4 */
     void *reserved5;
     u_short (*tclWinNToHS) (u_short ns); /* 6 */
-    int (*tclWinSetSockOpt) (int s, int level, int optname, CONST char FAR * optval, int optlen); /* 7 */
+    int (*tclWinSetSockOpt) (int s, int level, int optname, const char FAR * optval, int optlen); /* 7 */
     unsigned long (*tclpGetPid) (Tcl_Pid pid); /* 8 */
     int (*tclWinGetPlatformId) (void); /* 9 */
     void *reserved10;
@@ -407,14 +407,14 @@ typedef struct TclIntPlatStubs {
     int (*tclpCloseFile) (TclFile file); /* 12 */
     Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr); /* 13 */
     int (*tclpCreatePipe) (TclFile * readPipe, TclFile * writePipe); /* 14 */
-    int (*tclpCreateProcess) (Tcl_Interp * interp, int argc, CONST char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr); /* 15 */
+    int (*tclpCreateProcess) (Tcl_Interp * interp, int argc, const char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr); /* 15 */
     void *reserved16;
     void *reserved17;
     TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 18 */
-    TclFile (*tclpOpenFile) (CONST char * fname, int mode); /* 19 */
+    TclFile (*tclpOpenFile) (const char * fname, int mode); /* 19 */
     void (*tclWinAddProcess) (HANDLE hProcess, DWORD id); /* 20 */
     void *reserved21;
-    TclFile (*tclpCreateTempFile) (CONST char * contents); /* 22 */
+    TclFile (*tclpCreateTempFile) (const char * contents); /* 22 */
     char * (*tclpGetTZName) (int isdst); /* 23 */
     char * (*tclWinNoBackslash) (char * path); /* 24 */
     void *reserved25;
@@ -428,26 +428,26 @@ typedef struct TclIntPlatStubs {
     int (*tclpCloseFile) (TclFile file); /* 1 */
     Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr); /* 2 */
     int (*tclpCreatePipe) (TclFile * readPipe, TclFile * writePipe); /* 3 */
-    int (*tclpCreateProcess) (Tcl_Interp * interp, int argc, CONST char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr); /* 4 */
+    int (*tclpCreateProcess) (Tcl_Interp * interp, int argc, const char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr); /* 4 */
     void *reserved5;
     TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 6 */
-    TclFile (*tclpOpenFile) (CONST char * fname, int mode); /* 7 */
+    TclFile (*tclpOpenFile) (const char * fname, int mode); /* 7 */
     int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
-    TclFile (*tclpCreateTempFile) (CONST char * contents); /* 9 */
+    TclFile (*tclpCreateTempFile) (const char * contents); /* 9 */
     Tcl_DirEntry * (*tclpReaddir) (DIR * dir); /* 10 */
-    struct tm * (*tclpLocaltime_unix) (CONST time_t * clock); /* 11 */
-    struct tm * (*tclpGmtime_unix) (CONST time_t * clock); /* 12 */
+    struct tm * (*tclpLocaltime_unix) (const time_t * clock); /* 11 */
+    struct tm * (*tclpGmtime_unix) (const time_t * clock); /* 12 */
     char * (*tclpInetNtoa) (struct in_addr addr); /* 13 */
-    int (*tclUnixCopyFile) (CONST char * src, CONST char * dst, CONST Tcl_StatBuf * statBufPtr, int dontCopyAtts); /* 14 */
+    int (*tclUnixCopyFile) (const char * src, const char * dst, const Tcl_StatBuf * statBufPtr, int dontCopyAtts); /* 14 */
     int (*tclMacOSXGetFileAttribute) (Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj ** attributePtrPtr); /* 15 */
     int (*tclMacOSXSetFileAttribute) (Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj * attributePtr); /* 16 */
-    int (*tclMacOSXCopyFileAttributes) (CONST char * src, CONST char * dst, CONST Tcl_StatBuf * statBufPtr); /* 17 */
-    int (*tclMacOSXMatchType) (Tcl_Interp * interp, CONST char * pathName, CONST char * fileName, Tcl_StatBuf * statBufPtr, Tcl_GlobTypeData * types); /* 18 */
+    int (*tclMacOSXCopyFileAttributes) (const char * src, const char * dst, const Tcl_StatBuf * statBufPtr); /* 17 */
+    int (*tclMacOSXMatchType) (Tcl_Interp * interp, const char * pathName, const char * fileName, Tcl_StatBuf * statBufPtr, Tcl_GlobTypeData * types); /* 18 */
 #endif /* MACOSX */
 } TclIntPlatStubs;
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-extern CONST TclIntPlatStubs *tclIntPlatStubsPtr;
+extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h
index 31f807d..4cdd515 100644
--- a/generic/tclOODecls.h
+++ b/generic/tclOODecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOODecls.h,v 1.9 2008/10/17 18:42:12 nijtmans Exp $
+ * $Id: tclOODecls.h,v 1.10 2008/10/22 20:23:59 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  */
@@ -44,9 +44,9 @@ extern const char *TclOOInitializeStubs(Tcl_Interp *, const char *version);
 #ifndef Tcl_CopyObjectInstance_TCL_DECLARED
 #define Tcl_CopyObjectInstance_TCL_DECLARED
 /* 0 */
-EXTERN Tcl_Object	Tcl_CopyObjectInstance (Tcl_Interp * interp, 
-				Tcl_Object sourceObject, 
-				const char * targetName, 
+EXTERN Tcl_Object	Tcl_CopyObjectInstance (Tcl_Interp * interp,
+				Tcl_Object sourceObject,
+				const char * targetName,
 				const char * targetNamespaceName);
 #endif
 #ifndef Tcl_GetClassAsObject_TCL_DECLARED
@@ -67,7 +67,7 @@ EXTERN Tcl_Command	Tcl_GetObjectCommand (Tcl_Object object);
 #ifndef Tcl_GetObjectFromObj_TCL_DECLARED
 #define Tcl_GetObjectFromObj_TCL_DECLARED
 /* 4 */
-EXTERN Tcl_Object	Tcl_GetObjectFromObj (Tcl_Interp * interp, 
+EXTERN Tcl_Object	Tcl_GetObjectFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tcl_GetObjectNamespace_TCL_DECLARED
@@ -93,8 +93,8 @@ EXTERN int		Tcl_MethodIsPublic (Tcl_Method method);
 #ifndef Tcl_MethodIsType_TCL_DECLARED
 #define Tcl_MethodIsType_TCL_DECLARED
 /* 9 */
-EXTERN int		Tcl_MethodIsType (Tcl_Method method, 
-				const Tcl_MethodType * typePtr, 
+EXTERN int		Tcl_MethodIsType (Tcl_Method method,
+				const Tcl_MethodType * typePtr,
 				ClientData * clientDataPtr);
 #endif
 #ifndef Tcl_MethodName_TCL_DECLARED
@@ -105,25 +105,25 @@ EXTERN Tcl_Obj *	Tcl_MethodName (Tcl_Method method);
 #ifndef Tcl_NewInstanceMethod_TCL_DECLARED
 #define Tcl_NewInstanceMethod_TCL_DECLARED
 /* 11 */
-EXTERN Tcl_Method	Tcl_NewInstanceMethod (Tcl_Interp * interp, 
-				Tcl_Object object, Tcl_Obj * nameObj, 
-				int isPublic, const Tcl_MethodType * typePtr, 
+EXTERN Tcl_Method	Tcl_NewInstanceMethod (Tcl_Interp * interp,
+				Tcl_Object object, Tcl_Obj * nameObj,
+				int isPublic, const Tcl_MethodType * typePtr,
 				ClientData clientData);
 #endif
 #ifndef Tcl_NewMethod_TCL_DECLARED
 #define Tcl_NewMethod_TCL_DECLARED
 /* 12 */
-EXTERN Tcl_Method	Tcl_NewMethod (Tcl_Interp * interp, Tcl_Class cls, 
-				Tcl_Obj * nameObj, int isPublic, 
-				const Tcl_MethodType * typePtr, 
+EXTERN Tcl_Method	Tcl_NewMethod (Tcl_Interp * interp, Tcl_Class cls,
+				Tcl_Obj * nameObj, int isPublic,
+				const Tcl_MethodType * typePtr,
 				ClientData clientData);
 #endif
 #ifndef Tcl_NewObjectInstance_TCL_DECLARED
 #define Tcl_NewObjectInstance_TCL_DECLARED
 /* 13 */
-EXTERN Tcl_Object	Tcl_NewObjectInstance (Tcl_Interp * interp, 
-				Tcl_Class cls, const char * nameStr, 
-				const char * nsNameStr, int objc, 
+EXTERN Tcl_Object	Tcl_NewObjectInstance (Tcl_Interp * interp,
+				Tcl_Class cls, const char * nameStr,
+				const char * nsNameStr, int objc,
 				Tcl_Obj *const * objv, int skip);
 #endif
 #ifndef Tcl_ObjectDeleted_TCL_DECLARED
@@ -156,34 +156,34 @@ EXTERN int		Tcl_ObjectContextSkippedArgs (
 #ifndef Tcl_ClassGetMetadata_TCL_DECLARED
 #define Tcl_ClassGetMetadata_TCL_DECLARED
 /* 19 */
-EXTERN ClientData	Tcl_ClassGetMetadata (Tcl_Class clazz, 
+EXTERN ClientData	Tcl_ClassGetMetadata (Tcl_Class clazz,
 				const Tcl_ObjectMetadataType * typePtr);
 #endif
 #ifndef Tcl_ClassSetMetadata_TCL_DECLARED
 #define Tcl_ClassSetMetadata_TCL_DECLARED
 /* 20 */
-EXTERN void		Tcl_ClassSetMetadata (Tcl_Class clazz, 
-				const Tcl_ObjectMetadataType * typePtr, 
+EXTERN void		Tcl_ClassSetMetadata (Tcl_Class clazz,
+				const Tcl_ObjectMetadataType * typePtr,
 				ClientData metadata);
 #endif
 #ifndef Tcl_ObjectGetMetadata_TCL_DECLARED
 #define Tcl_ObjectGetMetadata_TCL_DECLARED
 /* 21 */
-EXTERN ClientData	Tcl_ObjectGetMetadata (Tcl_Object object, 
+EXTERN ClientData	Tcl_ObjectGetMetadata (Tcl_Object object,
 				const Tcl_ObjectMetadataType * typePtr);
 #endif
 #ifndef Tcl_ObjectSetMetadata_TCL_DECLARED
 #define Tcl_ObjectSetMetadata_TCL_DECLARED
 /* 22 */
-EXTERN void		Tcl_ObjectSetMetadata (Tcl_Object object, 
-				const Tcl_ObjectMetadataType * typePtr, 
+EXTERN void		Tcl_ObjectSetMetadata (Tcl_Object object,
+				const Tcl_ObjectMetadataType * typePtr,
 				ClientData metadata);
 #endif
 #ifndef Tcl_ObjectContextInvokeNext_TCL_DECLARED
 #define Tcl_ObjectContextInvokeNext_TCL_DECLARED
 /* 23 */
-EXTERN int		Tcl_ObjectContextInvokeNext (Tcl_Interp * interp, 
-				Tcl_ObjectContext context, int objc, 
+EXTERN int		Tcl_ObjectContextInvokeNext (Tcl_Interp * interp,
+				Tcl_ObjectContext context, int objc,
 				Tcl_Obj *const * objv, int skip);
 #endif
 #ifndef Tcl_ObjectGetMethodNameMapper_TCL_DECLARED
@@ -195,29 +195,29 @@ EXTERN Tcl_ObjectMapMethodNameProc Tcl_ObjectGetMethodNameMapper (
 #ifndef Tcl_ObjectSetMethodNameMapper_TCL_DECLARED
 #define Tcl_ObjectSetMethodNameMapper_TCL_DECLARED
 /* 25 */
-EXTERN void		Tcl_ObjectSetMethodNameMapper (Tcl_Object object, 
+EXTERN void		Tcl_ObjectSetMethodNameMapper (Tcl_Object object,
 				Tcl_ObjectMapMethodNameProc mapMethodNameProc);
 #endif
 #ifndef Tcl_ClassSetConstructor_TCL_DECLARED
 #define Tcl_ClassSetConstructor_TCL_DECLARED
 /* 26 */
-EXTERN void		Tcl_ClassSetConstructor (Tcl_Interp * interp, 
+EXTERN void		Tcl_ClassSetConstructor (Tcl_Interp * interp,
 				Tcl_Class clazz, Tcl_Method method);
 #endif
 #ifndef Tcl_ClassSetDestructor_TCL_DECLARED
 #define Tcl_ClassSetDestructor_TCL_DECLARED
 /* 27 */
-EXTERN void		Tcl_ClassSetDestructor (Tcl_Interp * interp, 
+EXTERN void		Tcl_ClassSetDestructor (Tcl_Interp * interp,
 				Tcl_Class clazz, Tcl_Method method);
 #endif
 
 typedef struct TclOOStubHooks {
-    CONST struct TclOOIntStubs *tclOOIntStubs;
+    const struct TclOOIntStubs *tclOOIntStubs;
 } TclOOStubHooks;
 
 typedef struct TclOOStubs {
     int magic;
-    CONST struct TclOOStubHooks *hooks;
+    const struct TclOOStubHooks *hooks;
 
     Tcl_Object (*tcl_CopyObjectInstance) (Tcl_Interp * interp, Tcl_Object sourceObject, const char * targetName, const char * targetNamespaceName); /* 0 */
     Tcl_Object (*tcl_GetClassAsObject) (Tcl_Class clazz); /* 1 */
@@ -250,7 +250,7 @@ typedef struct TclOOStubs {
 } TclOOStubs;
 
 #if defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS)
-extern CONST TclOOStubs *tclOOStubsPtr;
+extern const TclOOStubs *tclOOStubsPtr;
 #endif /* defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS) */
 
 #if defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS)
diff --git a/generic/tclOOIntDecls.h b/generic/tclOOIntDecls.h
index 49aa7de..807c333 100644
--- a/generic/tclOOIntDecls.h
+++ b/generic/tclOOIntDecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOOIntDecls.h,v 1.9 2008/10/17 18:42:12 nijtmans Exp $
+ * $Id: tclOOIntDecls.h,v 1.10 2008/10/22 20:23:59 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  */
@@ -38,128 +38,128 @@ EXTERN Tcl_Object	TclOOGetDefineCmdContext (Tcl_Interp * interp);
 #ifndef TclOOMakeProcInstanceMethod_TCL_DECLARED
 #define TclOOMakeProcInstanceMethod_TCL_DECLARED
 /* 1 */
-EXTERN Tcl_Method	TclOOMakeProcInstanceMethod (Tcl_Interp * interp, 
-				Object * oPtr, int flags, Tcl_Obj * nameObj, 
-				Tcl_Obj * argsObj, Tcl_Obj * bodyObj, 
-				const Tcl_MethodType * typePtr, 
+EXTERN Tcl_Method	TclOOMakeProcInstanceMethod (Tcl_Interp * interp,
+				Object * oPtr, int flags, Tcl_Obj * nameObj,
+				Tcl_Obj * argsObj, Tcl_Obj * bodyObj,
+				const Tcl_MethodType * typePtr,
 				ClientData clientData, Proc ** procPtrPtr);
 #endif
 #ifndef TclOOMakeProcMethod_TCL_DECLARED
 #define TclOOMakeProcMethod_TCL_DECLARED
 /* 2 */
-EXTERN Tcl_Method	TclOOMakeProcMethod (Tcl_Interp * interp, 
-				Class * clsPtr, int flags, Tcl_Obj * nameObj, 
-				const char * namePtr, Tcl_Obj * argsObj, 
-				Tcl_Obj * bodyObj, 
-				const Tcl_MethodType * typePtr, 
+EXTERN Tcl_Method	TclOOMakeProcMethod (Tcl_Interp * interp,
+				Class * clsPtr, int flags, Tcl_Obj * nameObj,
+				const char * namePtr, Tcl_Obj * argsObj,
+				Tcl_Obj * bodyObj,
+				const Tcl_MethodType * typePtr,
 				ClientData clientData, Proc ** procPtrPtr);
 #endif
 #ifndef TclOONewProcInstanceMethod_TCL_DECLARED
 #define TclOONewProcInstanceMethod_TCL_DECLARED
 /* 3 */
-EXTERN Method *		TclOONewProcInstanceMethod (Tcl_Interp * interp, 
-				Object * oPtr, int flags, Tcl_Obj * nameObj, 
-				Tcl_Obj * argsObj, Tcl_Obj * bodyObj, 
+EXTERN Method *		TclOONewProcInstanceMethod (Tcl_Interp * interp,
+				Object * oPtr, int flags, Tcl_Obj * nameObj,
+				Tcl_Obj * argsObj, Tcl_Obj * bodyObj,
 				ProcedureMethod ** pmPtrPtr);
 #endif
 #ifndef TclOONewProcMethod_TCL_DECLARED
 #define TclOONewProcMethod_TCL_DECLARED
 /* 4 */
-EXTERN Method *		TclOONewProcMethod (Tcl_Interp * interp, 
-				Class * clsPtr, int flags, Tcl_Obj * nameObj, 
-				Tcl_Obj * argsObj, Tcl_Obj * bodyObj, 
+EXTERN Method *		TclOONewProcMethod (Tcl_Interp * interp,
+				Class * clsPtr, int flags, Tcl_Obj * nameObj,
+				Tcl_Obj * argsObj, Tcl_Obj * bodyObj,
 				ProcedureMethod ** pmPtrPtr);
 #endif
 #ifndef TclOOObjectCmdCore_TCL_DECLARED
 #define TclOOObjectCmdCore_TCL_DECLARED
 /* 5 */
-EXTERN int		TclOOObjectCmdCore (Object * oPtr, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *const * objv, int publicOnly, 
+EXTERN int		TclOOObjectCmdCore (Object * oPtr,
+				Tcl_Interp * interp, int objc,
+				Tcl_Obj *const * objv, int publicOnly,
 				Class * startCls);
 #endif
 #ifndef TclOOIsReachable_TCL_DECLARED
 #define TclOOIsReachable_TCL_DECLARED
 /* 6 */
-EXTERN int		TclOOIsReachable (Class * targetPtr, 
+EXTERN int		TclOOIsReachable (Class * targetPtr,
 				Class * startPtr);
 #endif
 #ifndef TclOONewForwardMethod_TCL_DECLARED
 #define TclOONewForwardMethod_TCL_DECLARED
 /* 7 */
-EXTERN Method *		TclOONewForwardMethod (Tcl_Interp * interp, 
-				Class * clsPtr, int isPublic, 
+EXTERN Method *		TclOONewForwardMethod (Tcl_Interp * interp,
+				Class * clsPtr, int isPublic,
 				Tcl_Obj * nameObj, Tcl_Obj * prefixObj);
 #endif
 #ifndef TclOONewForwardInstanceMethod_TCL_DECLARED
 #define TclOONewForwardInstanceMethod_TCL_DECLARED
 /* 8 */
-EXTERN Method *		TclOONewForwardInstanceMethod (Tcl_Interp * interp, 
-				Object * oPtr, int isPublic, 
+EXTERN Method *		TclOONewForwardInstanceMethod (Tcl_Interp * interp,
+				Object * oPtr, int isPublic,
 				Tcl_Obj * nameObj, Tcl_Obj * prefixObj);
 #endif
 #ifndef TclOONewProcInstanceMethodEx_TCL_DECLARED
 #define TclOONewProcInstanceMethodEx_TCL_DECLARED
 /* 9 */
-EXTERN Tcl_Method	TclOONewProcInstanceMethodEx (Tcl_Interp * interp, 
-				Tcl_Object oPtr, 
-				TclOO_PreCallProc preCallPtr, 
-				TclOO_PostCallProc postCallPtr, 
-				ProcErrorProc errProc, ClientData clientData, 
-				Tcl_Obj * nameObj, Tcl_Obj * argsObj, 
-				Tcl_Obj * bodyObj, int flags, 
+EXTERN Tcl_Method	TclOONewProcInstanceMethodEx (Tcl_Interp * interp,
+				Tcl_Object oPtr,
+				TclOO_PreCallProc preCallPtr,
+				TclOO_PostCallProc postCallPtr,
+				ProcErrorProc errProc, ClientData clientData,
+				Tcl_Obj * nameObj, Tcl_Obj * argsObj,
+				Tcl_Obj * bodyObj, int flags,
 				void ** internalTokenPtr);
 #endif
 #ifndef TclOONewProcMethodEx_TCL_DECLARED
 #define TclOONewProcMethodEx_TCL_DECLARED
 /* 10 */
-EXTERN Tcl_Method	TclOONewProcMethodEx (Tcl_Interp * interp, 
-				Tcl_Class clsPtr, 
-				TclOO_PreCallProc preCallPtr, 
-				TclOO_PostCallProc postCallPtr, 
-				ProcErrorProc errProc, ClientData clientData, 
-				Tcl_Obj * nameObj, Tcl_Obj * argsObj, 
-				Tcl_Obj * bodyObj, int flags, 
+EXTERN Tcl_Method	TclOONewProcMethodEx (Tcl_Interp * interp,
+				Tcl_Class clsPtr,
+				TclOO_PreCallProc preCallPtr,
+				TclOO_PostCallProc postCallPtr,
+				ProcErrorProc errProc, ClientData clientData,
+				Tcl_Obj * nameObj, Tcl_Obj * argsObj,
+				Tcl_Obj * bodyObj, int flags,
 				void ** internalTokenPtr);
 #endif
 #ifndef TclOOInvokeObject_TCL_DECLARED
 #define TclOOInvokeObject_TCL_DECLARED
 /* 11 */
-EXTERN int		TclOOInvokeObject (Tcl_Interp * interp, 
-				Tcl_Object object, Tcl_Class startCls, 
-				int publicPrivate, int objc, 
+EXTERN int		TclOOInvokeObject (Tcl_Interp * interp,
+				Tcl_Object object, Tcl_Class startCls,
+				int publicPrivate, int objc,
 				Tcl_Obj *const * objv);
 #endif
 #ifndef TclOOObjectSetFilters_TCL_DECLARED
 #define TclOOObjectSetFilters_TCL_DECLARED
 /* 12 */
-EXTERN void		TclOOObjectSetFilters (Object * oPtr, int numFilters, 
+EXTERN void		TclOOObjectSetFilters (Object * oPtr, int numFilters,
 				Tcl_Obj *const * filters);
 #endif
 #ifndef TclOOClassSetFilters_TCL_DECLARED
 #define TclOOClassSetFilters_TCL_DECLARED
 /* 13 */
-EXTERN void		TclOOClassSetFilters (Tcl_Interp * interp, 
-				Class * classPtr, int numFilters, 
+EXTERN void		TclOOClassSetFilters (Tcl_Interp * interp,
+				Class * classPtr, int numFilters,
 				Tcl_Obj *const * filters);
 #endif
 #ifndef TclOOObjectSetMixins_TCL_DECLARED
 #define TclOOObjectSetMixins_TCL_DECLARED
 /* 14 */
-EXTERN void		TclOOObjectSetMixins (Object * oPtr, int numMixins, 
+EXTERN void		TclOOObjectSetMixins (Object * oPtr, int numMixins,
 				Class *const * mixins);
 #endif
 #ifndef TclOOClassSetMixins_TCL_DECLARED
 #define TclOOClassSetMixins_TCL_DECLARED
 /* 15 */
-EXTERN void		TclOOClassSetMixins (Tcl_Interp * interp, 
-				Class * classPtr, int numMixins, 
+EXTERN void		TclOOClassSetMixins (Tcl_Interp * interp,
+				Class * classPtr, int numMixins,
 				Class *const * mixins);
 #endif
 
 typedef struct TclOOIntStubs {
     int magic;
-    CONST struct TclOOIntStubHooks *hooks;
+    const struct TclOOIntStubHooks *hooks;
 
     Tcl_Object (*tclOOGetDefineCmdContext) (Tcl_Interp * interp); /* 0 */
     Tcl_Method (*tclOOMakeProcInstanceMethod) (Tcl_Interp * interp, Object * oPtr, int flags, Tcl_Obj * nameObj, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, const Tcl_MethodType * typePtr, ClientData clientData, Proc ** procPtrPtr); /* 1 */
@@ -180,7 +180,7 @@ typedef struct TclOOIntStubs {
 } TclOOIntStubs;
 
 #if defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS)
-extern CONST TclOOIntStubs *tclOOIntStubsPtr;
+extern const TclOOIntStubs *tclOOIntStubsPtr;
 #endif /* defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS) */
 
 #if defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS)
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index b7e49b5..a868584 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -6,7 +6,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.32 2008/07/22 23:01:43 das Exp $
+ * RCS: @(#) $Id: tclPlatDecls.h,v 1.33 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 #ifndef _TCLPLATDECLS
@@ -51,13 +51,13 @@
 #ifndef Tcl_WinUtfToTChar_TCL_DECLARED
 #define Tcl_WinUtfToTChar_TCL_DECLARED
 /* 0 */
-EXTERN TCHAR *		Tcl_WinUtfToTChar (CONST char * str, int len, 
+EXTERN TCHAR *		Tcl_WinUtfToTChar (const char * str, int len,
 				Tcl_DString * dsPtr);
 #endif
 #ifndef Tcl_WinTCharToUtf_TCL_DECLARED
 #define Tcl_WinTCharToUtf_TCL_DECLARED
 /* 1 */
-EXTERN char *		Tcl_WinTCharToUtf (CONST TCHAR * str, int len, 
+EXTERN char *		Tcl_WinTCharToUtf (const TCHAR * str, int len,
 				Tcl_DString * dsPtr);
 #endif
 #endif /* WIN */
@@ -65,37 +65,37 @@ EXTERN char *		Tcl_WinTCharToUtf (CONST TCHAR * str, int len,
 #ifndef Tcl_MacOSXOpenBundleResources_TCL_DECLARED
 #define Tcl_MacOSXOpenBundleResources_TCL_DECLARED
 /* 0 */
-EXTERN int		Tcl_MacOSXOpenBundleResources (Tcl_Interp * interp, 
-				CONST char * bundleName, int hasResourceFile, 
+EXTERN int		Tcl_MacOSXOpenBundleResources (Tcl_Interp * interp,
+				const char * bundleName, int hasResourceFile,
 				int maxPathLen, char * libraryPath);
 #endif
 #ifndef Tcl_MacOSXOpenVersionedBundleResources_TCL_DECLARED
 #define Tcl_MacOSXOpenVersionedBundleResources_TCL_DECLARED
 /* 1 */
 EXTERN int		Tcl_MacOSXOpenVersionedBundleResources (
-				Tcl_Interp * interp, CONST char * bundleName, 
-				CONST char * bundleVersion, 
-				int hasResourceFile, int maxPathLen, 
+				Tcl_Interp * interp, const char * bundleName,
+				const char * bundleVersion,
+				int hasResourceFile, int maxPathLen,
 				char * libraryPath);
 #endif
 #endif /* MACOSX */
 
 typedef struct TclPlatStubs {
     int magic;
-    CONST struct TclPlatStubHooks *hooks;
+    const struct TclPlatStubHooks *hooks;
 
 #ifdef __WIN32__ /* WIN */
-    TCHAR * (*tcl_WinUtfToTChar) (CONST char * str, int len, Tcl_DString * dsPtr); /* 0 */
-    char * (*tcl_WinTCharToUtf) (CONST TCHAR * str, int len, Tcl_DString * dsPtr); /* 1 */
+    TCHAR * (*tcl_WinUtfToTChar) (const char * str, int len, Tcl_DString * dsPtr); /* 0 */
+    char * (*tcl_WinTCharToUtf) (const TCHAR * str, int len, Tcl_DString * dsPtr); /* 1 */
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
-    int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp * interp, CONST char * bundleName, int hasResourceFile, int maxPathLen, char * libraryPath); /* 0 */
-    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp * interp, CONST char * bundleName, CONST char * bundleVersion, int hasResourceFile, int maxPathLen, char * libraryPath); /* 1 */
+    int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp * interp, const char * bundleName, int hasResourceFile, int maxPathLen, char * libraryPath); /* 0 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp * interp, const char * bundleName, const char * bundleVersion, int hasResourceFile, int maxPathLen, char * libraryPath); /* 1 */
 #endif /* MACOSX */
 } TclPlatStubs;
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-extern CONST TclPlatStubs *tclPlatStubsPtr;
+extern const TclPlatStubs *tclPlatStubsPtr;
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index cdc66e7..a95f056 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * tclStubInit.c --
  *
  *	This file contains the initializers for the Tcl stub vectors.
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclStubInit.c,v 1.166 2008/10/03 00:09:43 dkf Exp $
+ * RCS: @(#) $Id: tclStubInit.c,v 1.167 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -1134,7 +1134,7 @@ static const TclStubs tclStubs = {
 
 /* !END!: Do not edit above this line. */
 
-/* 
+/*
  * Module-scope pointers to the main static stubs tables, used for package
  * initialization via Tcl_PkgProvideEx().
  */
diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index 62869d4..24eef57 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclStubLib.c,v 1.28 2008/10/14 22:37:53 nijtmans Exp $
+ * RCS: @(#) $Id: tclStubLib.c,v 1.29 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 /*
@@ -173,7 +173,7 @@ TclTomMathInitializeStubs(
     const char *packageName = "tcl::tommath";
     const char *errMsg = NULL;
     ClientData pkgClientData = NULL;
-    const char *actualVersion = 
+    const char *actualVersion =
 	Tcl_PkgRequireEx(interp, packageName, version, exact, &pkgClientData);
     TclTomMathStubs *stubsPtr = pkgClientData;
 
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index 9ace7fd..ec91aad 100644
--- a/generic/tclTomMath.decls
+++ b/generic/tclTomMath.decls
@@ -12,8 +12,8 @@
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: tclTomMath.decls,v 1.4 2008/07/24 22:57:56 nijtmans Exp $
+#
+# RCS: @(#) $Id: tclTomMath.decls,v 1.5 2008/10/22 20:23:59 nijtmans Exp $
 
 library tcl
 
@@ -134,7 +134,7 @@ declare 35 generic {
     int TclBN_mp_radix_size(mp_int* a, int radix, int* size)
 }
 declare 36 generic {
-    int TclBN_mp_read_radix(mp_int* a, CONST char* str, int radix)
+    int TclBN_mp_read_radix(mp_int* a, const char* str, int radix)
 }
 declare 37 generic {
     void TclBN_mp_rshd(mp_int * a, int shift)
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 203e90c..68521ca 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclTomMathDecls.h,v 1.8 2008/07/24 22:57:57 nijtmans Exp $
+ * RCS: @(#) $Id: tclTomMathDecls.h,v 1.9 2008/10/22 20:23:59 nijtmans Exp $
  */
 
 #ifndef _TCLTOMMATHDECLS
@@ -205,13 +205,13 @@ EXTERN int		TclBN_mp_count_bits (mp_int* a);
 #ifndef TclBN_mp_div_TCL_DECLARED
 #define TclBN_mp_div_TCL_DECLARED
 /* 13 */
-EXTERN int		TclBN_mp_div (mp_int* a, mp_int* b, mp_int* q, 
+EXTERN int		TclBN_mp_div (mp_int* a, mp_int* b, mp_int* q,
 				mp_int* r);
 #endif
 #ifndef TclBN_mp_div_d_TCL_DECLARED
 #define TclBN_mp_div_d_TCL_DECLARED
 /* 14 */
-EXTERN int		TclBN_mp_div_d (mp_int* a, mp_digit b, mp_int* q, 
+EXTERN int		TclBN_mp_div_d (mp_int* a, mp_digit b, mp_int* q,
 				mp_digit* r);
 #endif
 #ifndef TclBN_mp_div_2_TCL_DECLARED
@@ -222,7 +222,7 @@ EXTERN int		TclBN_mp_div_2 (mp_int* a, mp_int* q);
 #ifndef TclBN_mp_div_2d_TCL_DECLARED
 #define TclBN_mp_div_2d_TCL_DECLARED
 /* 16 */
-EXTERN int		TclBN_mp_div_2d (mp_int* a, int b, mp_int* q, 
+EXTERN int		TclBN_mp_div_2d (mp_int* a, int b, mp_int* q,
 				mp_int* r);
 #endif
 #ifndef TclBN_mp_div_3_TCL_DECLARED
@@ -323,7 +323,7 @@ EXTERN int		TclBN_mp_radix_size (mp_int* a, int radix, int* size);
 #ifndef TclBN_mp_read_radix_TCL_DECLARED
 #define TclBN_mp_read_radix_TCL_DECLARED
 /* 36 */
-EXTERN int		TclBN_mp_read_radix (mp_int* a, CONST char* str, 
+EXTERN int		TclBN_mp_read_radix (mp_int* a, const char* str,
 				int radix);
 #endif
 #ifndef TclBN_mp_rshd_TCL_DECLARED
@@ -364,19 +364,19 @@ EXTERN int		TclBN_mp_sub_d (mp_int* a, mp_digit b, mp_int* c);
 #ifndef TclBN_mp_to_unsigned_bin_TCL_DECLARED
 #define TclBN_mp_to_unsigned_bin_TCL_DECLARED
 /* 44 */
-EXTERN int		TclBN_mp_to_unsigned_bin (mp_int* a, 
+EXTERN int		TclBN_mp_to_unsigned_bin (mp_int* a,
 				unsigned char* b);
 #endif
 #ifndef TclBN_mp_to_unsigned_bin_n_TCL_DECLARED
 #define TclBN_mp_to_unsigned_bin_n_TCL_DECLARED
 /* 45 */
-EXTERN int		TclBN_mp_to_unsigned_bin_n (mp_int* a, 
+EXTERN int		TclBN_mp_to_unsigned_bin_n (mp_int* a,
 				unsigned char* b, unsigned long* outlen);
 #endif
 #ifndef TclBN_mp_toradix_n_TCL_DECLARED
 #define TclBN_mp_toradix_n_TCL_DECLARED
 /* 46 */
-EXTERN int		TclBN_mp_toradix_n (mp_int* a, char* str, int radix, 
+EXTERN int		TclBN_mp_toradix_n (mp_int* a, char* str, int radix,
 				int maxlen);
 #endif
 #ifndef TclBN_mp_unsigned_bin_size_TCL_DECLARED
@@ -402,7 +402,7 @@ EXTERN void		TclBN_reverse (unsigned char* s, int len);
 #ifndef TclBN_fast_s_mp_mul_digs_TCL_DECLARED
 #define TclBN_fast_s_mp_mul_digs_TCL_DECLARED
 /* 51 */
-EXTERN int		TclBN_fast_s_mp_mul_digs (mp_int * a, mp_int * b, 
+EXTERN int		TclBN_fast_s_mp_mul_digs (mp_int * a, mp_int * b,
 				mp_int * c, int digs);
 #endif
 #ifndef TclBN_fast_s_mp_sqr_TCL_DECLARED
@@ -413,7 +413,7 @@ EXTERN int		TclBN_fast_s_mp_sqr (mp_int* a, mp_int* b);
 #ifndef TclBN_mp_karatsuba_mul_TCL_DECLARED
 #define TclBN_mp_karatsuba_mul_TCL_DECLARED
 /* 53 */
-EXTERN int		TclBN_mp_karatsuba_mul (mp_int* a, mp_int* b, 
+EXTERN int		TclBN_mp_karatsuba_mul (mp_int* a, mp_int* b,
 				mp_int* c);
 #endif
 #ifndef TclBN_mp_karatsuba_sqr_TCL_DECLARED
@@ -439,7 +439,7 @@ EXTERN int		TclBN_s_mp_add (mp_int* a, mp_int* b, mp_int* c);
 #ifndef TclBN_s_mp_mul_digs_TCL_DECLARED
 #define TclBN_s_mp_mul_digs_TCL_DECLARED
 /* 58 */
-EXTERN int		TclBN_s_mp_mul_digs (mp_int* a, mp_int* b, mp_int* c, 
+EXTERN int		TclBN_s_mp_mul_digs (mp_int* a, mp_int* b, mp_int* c,
 				int digs);
 #endif
 #ifndef TclBN_s_mp_sqr_TCL_DECLARED
@@ -455,7 +455,7 @@ EXTERN int		TclBN_s_mp_sub (mp_int* a, mp_int* b, mp_int* c);
 
 typedef struct TclTomMathStubs {
     int magic;
-    CONST struct TclTomMathStubHooks *hooks;
+    const struct TclTomMathStubHooks *hooks;
 
     int (*tclBN_epoch) (void); /* 0 */
     int (*tclBN_revision) (void); /* 1 */
@@ -493,7 +493,7 @@ typedef struct TclTomMathStubs {
     int (*tclBN_mp_neg) (mp_int* a, mp_int* b); /* 33 */
     int (*tclBN_mp_or) (mp_int* a, mp_int* b, mp_int* c); /* 34 */
     int (*tclBN_mp_radix_size) (mp_int* a, int radix, int* size); /* 35 */
-    int (*tclBN_mp_read_radix) (mp_int* a, CONST char* str, int radix); /* 36 */
+    int (*tclBN_mp_read_radix) (mp_int* a, const char* str, int radix); /* 36 */
     void (*tclBN_mp_rshd) (mp_int * a, int shift); /* 37 */
     int (*tclBN_mp_shrink) (mp_int* a); /* 38 */
     void (*tclBN_mp_set) (mp_int* a, mp_digit b); /* 39 */
@@ -521,7 +521,7 @@ typedef struct TclTomMathStubs {
 } TclTomMathStubs;
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-extern CONST TclTomMathStubs *tclTomMathStubsPtr;
+extern const TclTomMathStubs *tclTomMathStubsPtr;
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 5172a73..17fb4ac 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: genStubs.tcl,v 1.28 2008/05/23 21:05:13 andreas_kupries Exp $
+# RCS: @(#) $Id: genStubs.tcl,v 1.29 2008/10/22 20:24:00 nijtmans Exp $
 
 package require Tcl 8.4
 
@@ -440,7 +440,7 @@ proc genStubs::makeDecl {name decl index} {
 			[lindex $arg 2]
 		if {[string length $line] + [string length $next] \
 			+ $pad > 76} {
-		    append text $line \n
+		    append text [string trimright $line] \n
 		    set line "\t\t\t\t"
 		    set pad 28
 		}
@@ -458,7 +458,7 @@ proc genStubs::makeDecl {name decl index} {
 			[lindex $arg 2]
 		if {[string length $line] + [string length $next] \
 			+ $pad > 76} {
-		    append text $line \n
+		    append text [string trimright $line] \n
 		    set line "\t\t\t\t"
 		    set pad 28
 		}
@@ -984,13 +984,13 @@ proc genStubs::emitHeader {name} {
 	foreach hook $hooks($name) {
 	    set capHook [string toupper [string index $hook 0]]
 	    append capHook [string range $hook 1 end]
-	    append text "    CONST struct ${capHook}Stubs *${hook}Stubs;\n"
+	    append text "    const struct ${capHook}Stubs *${hook}Stubs;\n"
 	}
 	append text "} ${capName}StubHooks;\n"
     }
     append text "\ntypedef struct ${capName}Stubs {\n"
     append text "    int magic;\n"
-    append text "    CONST struct ${capName}StubHooks *hooks;\n\n"
+    append text "    const struct ${capName}StubHooks *hooks;\n\n"
 
     emitSlots $name text
 
@@ -998,7 +998,7 @@ proc genStubs::emitHeader {name} {
 
     set upName [string toupper $libraryName]
     append text "\n#if defined(USE_${upName}_STUBS) && !defined(USE_${upName}_STUB_PROCS)\n"
-    append text "extern CONST ${capName}Stubs *${name}StubsPtr;"
+    append text "extern const ${capName}Stubs *${name}StubsPtr;"
     append text "\n#endif /* defined(USE_${upName}_STUBS) && !defined(USE_${upName}_STUB_PROCS) */\n"
 
     emitMacros $name text
@@ -1157,7 +1157,7 @@ proc genStubs::init {} {
 if {[string length [namespace which lassign]] == 0} {
     proc lassign {valueList args} {
 	if {[llength $args] == 0} {
-	    error "wrong # args: lassign list varname ?varname..?"
+	    error "wrong # args: should be \"lassign list varName ?varName ...?\""
 	}
 	uplevel [list foreach $args $valueList {break}]
 	return [lrange $valueList [llength $args] end]
author	nijtmans <nijtmans>	2008-10-22 20:23:59 (GMT)
committer	nijtmans <nijtmans>	2008-10-22 20:23:59 (GMT)
commit	1598402d198ca92b97f5b62e7ea54b72bdd09ccf (patch)
tree	f697e3956660aaac137dd0ede261598f7662548e
parent	7f623a9fc32a746e0fe85c9f913cbb1f81e92f8a (diff)
download	tcl-1598402d198ca92b97f5b62e7ea54b72bdd09ccf.zip tcl-1598402d198ca92b97f5b62e7ea54b72bdd09ccf.tar.gz tcl-1598402d198ca92b97f5b62e7ea54b72bdd09ccf.tar.bz2