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

broken since 8.4 and no-one complained about it.

1 files changed, 285 insertions, 285 deletions

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 {