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, 105 insertions, 105 deletions

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)
 }