just a few const -> CONST (in header files and .decls files)

and CONST -> const (.c files and internal .h files)

11 files changed, 107 insertions, 107 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index f5cc117..1b6326d 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.138 2008/07/24 21:54:39 nijtmans Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.139 2008/07/24 22:57:57 nijtmans Exp $
 
 library tcl
 
@@ -1037,7 +1037,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)
@@ -2137,7 +2137,7 @@ declare 586 generic {
 declare 587 generic {
     int Tcl_NRCallObjProc(Tcl_Interp *interp, Tcl_ObjCmdProc *objProc,
 			  ClientData clientData, int objc,
-	                     Tcl_Obj *const objv[])
+	                     Tcl_Obj *CONST objv[])
 }
 
 # TIP#304 (chan pipe)
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 1603726..bb44d58 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.140 2008/07/24 21:54:39 nijtmans Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.141 2008/07/24 22:57:57 nijtmans Exp $
  */
 
 #ifndef _TCLDECLS
@@ -1791,7 +1791,7 @@ EXTERN void		Tcl_AppendObjToObj (Tcl_Obj * objPtr,
 #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
@@ -3555,7 +3555,7 @@ EXTERN void		Tcl_NRAddCallback (Tcl_Interp * interp,
 EXTERN int		Tcl_NRCallObjProc (Tcl_Interp * interp, 
 				Tcl_ObjCmdProc * objProc, 
 				ClientData clientData, int objc, 
-				Tcl_Obj *const objv[]);
+				Tcl_Obj *CONST objv[]);
 #endif
 #ifndef Tcl_CreatePipe_TCL_DECLARED
 #define Tcl_CreatePipe_TCL_DECLARED
@@ -3910,7 +3910,7 @@ typedef struct TclStubs {
     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 */
@@ -4210,7 +4210,7 @@ typedef struct TclStubs {
     int (*tcl_NREvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 584 */
     int (*tcl_NRCmdSwap) (Tcl_Interp * interp, Tcl_Command cmd, int objc, Tcl_Obj *CONST objv[]); /* 585 */
     void (*tcl_NRAddCallback) (Tcl_Interp * interp, Tcl_NRPostProc * postProcPtr, ClientData data0, ClientData data1, ClientData data2, ClientData data3); /* 586 */
-    int (*tcl_NRCallObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData, int objc, Tcl_Obj *const objv[]); /* 587 */
+    int (*tcl_NRCallObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData, int objc, Tcl_Obj *CONST objv[]); /* 587 */
     int (*tcl_CreatePipe) (Tcl_Interp * interp, Tcl_Channel * rchan, Tcl_Channel * wchan, int flags); /* 588 */
 } TclStubs;
 
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 3e02cd7..e1e46d0 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.125 2008/07/22 23:05:31 das Exp $
+# RCS: @(#) $Id: tclInt.decls,v 1.126 2008/07/24 22:57:57 nijtmans Exp $
 
 library tcl
 
@@ -915,7 +915,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)
@@ -923,7 +923,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 {
@@ -948,7 +948,7 @@ declare 238 generic {
 }
 declare 239 generic {
     int TclNRInterpProc(ClientData clientData, Tcl_Interp *interp,
-	    int objc, Tcl_Obj *const objv[])
+	    int objc, Tcl_Obj *CONST objv[])
 }
 declare 240 generic {
     int TclNRInterpProcCore(Tcl_Interp *interp, Tcl_Obj *procNameObj,
@@ -963,7 +963,7 @@ declare 242 generic {
 
 declare 243 generic {
     int TclNREvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags,
-	    const CmdFrame *invoker, int word)
+	    CONST CmdFrame *invoker, int word)
 }
 ##############################################################################
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 7566e24..0587ecf 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclInt.h,v 1.378 2008/07/22 21:41:55 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.379 2008/07/24 22:57:55 nijtmans Exp $
  */
 
 #ifndef _TCLINT
@@ -163,13 +163,13 @@ typedef struct Tcl_ResolvedVarInfo {
 } Tcl_ResolvedVarInfo;
 
 typedef int (Tcl_ResolveCompiledVarProc) (Tcl_Interp *interp,
-	CONST84 char *name, int length, Tcl_Namespace *context,
+	const char *name, int length, Tcl_Namespace *context,
 	Tcl_ResolvedVarInfo **rPtr);
 
-typedef int (Tcl_ResolveVarProc) (Tcl_Interp *interp, CONST84 char *name,
+typedef int (Tcl_ResolveVarProc) (Tcl_Interp *interp, const char *name,
 	Tcl_Namespace *context, int flags, Tcl_Var *rPtr);
 
-typedef int (Tcl_ResolveCmdProc) (Tcl_Interp *interp, CONST84 char *name,
+typedef int (Tcl_ResolveCmdProc) (Tcl_Interp *interp, const char *name,
 	Tcl_Namespace *context, int flags, Tcl_Command *rPtr);
 
 typedef struct Tcl_ResolverInfo {
@@ -1335,7 +1335,7 @@ typedef struct ExecEnv {
     ExecStack *execStackPtr;	    /* Points to the first item in the
 				     * evaluation stack on the heap. */
     Tcl_Obj *constants[2];	    /* Pointers to constant "0" and "1"
-				     * objs. */ 
+				     * objs. */
     struct TEOV_record *recordPtr;  /* Top record in TEOV's stack */
     int tebcCall;                   /* used to distinguish tebc calls from
 				     * other calls to TEOV, and other comms
@@ -2789,8 +2789,8 @@ MODULE_SCOPE Tcl_Obj *	TclDisassembleByteCodeObj(Tcl_Obj *objPtr);
 MODULE_SCOPE void *     TclpThreadCreateKey(void);
 MODULE_SCOPE void       TclpThreadDeleteKey(void *keyPtr);
 MODULE_SCOPE void       TclpThreadSetMasterTSD(void *tsdKeyPtr, void *ptr);
-MODULE_SCOPE void *     TclpThreadGetMasterTSD(void *tsdKeyPtr); 
-  
+MODULE_SCOPE void *     TclpThreadGetMasterTSD(void *tsdKeyPtr);
+
 /*
  *----------------------------------------------------------------
  * Command procedures in the generic core:
@@ -4011,7 +4011,7 @@ MODULE_SCOPE void	TclBNInitBignumFromWideUInt(mp_int *bignum,
 #include "tclTomMathDecls.h"
 
 #endif /* _TCLINT */
-
+
 /*
  * Local Variables:
  * mode: c
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index f79728e..0ef9eef 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.121 2008/07/22 23:06:25 das Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.122 2008/07/24 22:57:54 nijtmans Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -1045,7 +1045,7 @@ EXTERN int		TclGetNamespaceFromObj (Tcl_Interp * interp,
 #define TclEvalObjEx_TCL_DECLARED
 /* 232 */
 EXTERN int		TclEvalObjEx (Tcl_Interp * interp, Tcl_Obj * objPtr, 
-				int flags, const CmdFrame * invoker, 
+				int flags, CONST CmdFrame * invoker, 
 				int word);
 #endif
 #ifndef TclGetSrcInfoForPc_TCL_DECLARED
@@ -1057,7 +1057,7 @@ EXTERN void		TclGetSrcInfoForPc (CmdFrame * contextPtr);
 #define TclVarHashCreateVar_TCL_DECLARED
 /* 234 */
 EXTERN Var *		TclVarHashCreateVar (TclVarHashTable * tablePtr, 
-				const char * key, int * newPtr);
+				CONST char * key, int * newPtr);
 #endif
 #ifndef TclInitVarHashTable_TCL_DECLARED
 #define TclInitVarHashTable_TCL_DECLARED
@@ -1087,7 +1087,7 @@ EXTERN int		TclEvalObjv_NR2 (Tcl_Interp * interp, int result,
 /* 239 */
 EXTERN int		TclNRInterpProc (ClientData clientData, 
 				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *const objv[]);
+				Tcl_Obj *CONST objv[]);
 #endif
 #ifndef TclNRInterpProcCore_TCL_DECLARED
 #define TclNRInterpProcCore_TCL_DECLARED
@@ -1111,7 +1111,7 @@ EXTERN void		TclNRPopAndFreeRecord (Tcl_Interp * interp);
 /* 243 */
 EXTERN int		TclNREvalObjEx (Tcl_Interp * interp, 
 				Tcl_Obj * objPtr, int flags, 
-				const CmdFrame * invoker, int word);
+				CONST CmdFrame * invoker, int word);
 #endif
 
 typedef struct TclIntStubs {
@@ -1374,18 +1374,18 @@ typedef struct TclIntStubs {
     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 (*tclEvalObjv_NR2) (Tcl_Interp * interp, int result, struct TEOV_record * rootPtr); /* 238 */
-    int (*tclNRInterpProc) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *const objv[]); /* 239 */
+    int (*tclNRInterpProc) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); /* 239 */
     int (*tclNRInterpProcCore) (Tcl_Interp * interp, Tcl_Obj * procNameObj, int skip, ProcErrorProc errorProc); /* 240 */
     struct TEOV_record * (*tclNRPushRecord) (Tcl_Interp * interp); /* 241 */
     void (*tclNRPopAndFreeRecord) (Tcl_Interp * interp); /* 242 */
-    int (*tclNREvalObjEx) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags, const CmdFrame * invoker, int word); /* 243 */
+    int (*tclNREvalObjEx) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags, CONST CmdFrame * invoker, int word); /* 243 */
 } TclIntStubs;
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 6c55d97..025109d 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.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: tclInterp.c,v 1.92 2008/07/21 22:50:35 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclInterp.c,v 1.93 2008/07/24 22:57:56 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -646,7 +646,7 @@ Tcl_InterpObjCmd(
 	int i, flags;
 	Tcl_Interp *slaveInterp;
 	Tcl_Obj *resultObjPtr;
-	static CONST char *options[] = {
+	static const char *options[] = {
 	    "-unwind",	"--",	NULL
 	};
 	enum option {
@@ -687,7 +687,7 @@ Tcl_InterpObjCmd(
 
 	/*
 	 * Did they specify a slave interp to cancel the script in
-	 * progress in?  If not, use the current interp. 
+	 * progress in?  If not, use the current interp.
 	 */
 
 	if (i < objc) {
@@ -1488,7 +1488,7 @@ AliasCreate(
 
     if (slaveInterp == masterInterp) {
 	aliasPtr->slaveCmd = Tcl_NRCreateCommand(slaveInterp,
-		TclGetString(namePtr), AliasObjCmd, AliasNRCmd, aliasPtr, 
+		TclGetString(namePtr), AliasObjCmd, AliasNRCmd, aliasPtr,
 		AliasObjCmdDeleteProc);
     } else {
     aliasPtr->slaveCmd = Tcl_CreateObjCommand(slaveInterp,
@@ -1763,7 +1763,7 @@ AliasNRCmd(
     Tcl_Obj *listPtr;
     List *listRep;
     int flags = TCL_EVAL_INVOKE;
-    
+
     /*
      * Append the arguments to the command prefix and invoke the command in
      * the target interp's global namespace.
@@ -1777,7 +1777,7 @@ AliasNRCmd(
     listRep = listPtr->internalRep.twoPtrValue.ptr1;
     listRep->elemCount = cmdc;
     cmdv = &listRep->elements;
-    
+
     prefv = &aliasPtr->objPtr;
     memcpy(cmdv, prefv, (size_t) (prefc * sizeof(Tcl_Obj *)));
     memcpy(cmdv+prefc, objv+1, (size_t) ((objc-1) * sizeof(Tcl_Obj *)));
@@ -2618,7 +2618,7 @@ SlaveEval(
 	 *
 	 * Do not let any intReps accross, with the exception of
 	 * bytecodes. The intrep spoiling is due to happen anyway when
-	 * compiling. 
+	 * compiling.
 	 */
 
         Interp *iPtr = (Interp *) interp;
@@ -2635,7 +2635,7 @@ SlaveEval(
 	}
 
 	TclArgumentGet (interp, objPtr, &invoker, &word);
-	
+
 	result = TclEvalObjEx(slaveInterp, objPtr, 0, invoker, word);
     } else {
 	objPtr = Tcl_ConcatObj(objc, objv);
diff --git a/generic/tclOO.decls b/generic/tclOO.decls
index bb30e20..1868397 100644
--- a/generic/tclOO.decls
+++ b/generic/tclOO.decls
@@ -1,5 +1,5 @@
 # -*- tcl -*-
-# $Id: tclOO.decls,v 1.2 2008/06/01 00:02:05 dkf Exp $
+# $Id: tclOO.decls,v 1.3 2008/07/24 22:57:56 nijtmans Exp $
 
 # public API
 library tclOO
@@ -8,8 +8,8 @@ hooks tclOOInt
 
 declare 0 generic {
     Tcl_Object Tcl_CopyObjectInstance(Tcl_Interp *interp,
-	    Tcl_Object sourceObject, const char *targetName,
-	    const char *targetNamespaceName)
+	    Tcl_Object sourceObject, CONST char *targetName,
+	    CONST char *targetNamespaceName)
 }
 declare 1 generic {
     Tcl_Object Tcl_GetClassAsObject(Tcl_Class clazz)
@@ -36,7 +36,7 @@ declare 8 generic {
     int Tcl_MethodIsPublic(Tcl_Method method)
 }
 declare 9 generic {
-    int Tcl_MethodIsType(Tcl_Method method, const Tcl_MethodType *typePtr,
+    int Tcl_MethodIsType(Tcl_Method method, CONST Tcl_MethodType *typePtr,
 	    ClientData *clientDataPtr)
 }
 declare 10 generic {
@@ -44,18 +44,18 @@ declare 10 generic {
 }
 declare 11 generic {
     Tcl_Method Tcl_NewInstanceMethod(Tcl_Interp *interp, Tcl_Object object,
-	    Tcl_Obj *nameObj, int isPublic, const Tcl_MethodType *typePtr,
+	    Tcl_Obj *nameObj, int isPublic, CONST Tcl_MethodType *typePtr,
 	    ClientData clientData)
 }
 declare 12 generic {
     Tcl_Method Tcl_NewMethod(Tcl_Interp *interp, Tcl_Class cls,
-	    Tcl_Obj *nameObj, int isPublic, const Tcl_MethodType *typePtr,
+	    Tcl_Obj *nameObj, int isPublic, CONST Tcl_MethodType *typePtr,
 	    ClientData clientData)
 }
 declare 13 generic {
     Tcl_Object Tcl_NewObjectInstance(Tcl_Interp *interp, Tcl_Class cls,
-	    const char *nameStr, const char *nsNameStr, int objc,
-	    Tcl_Obj *const *objv, int skip)
+	    CONST char *nameStr, CONST char *nsNameStr, int objc,
+	    Tcl_Obj *CONST *objv, int skip)
 }
 declare 14 generic {
     int Tcl_ObjectDeleted(Tcl_Object object)
@@ -74,23 +74,23 @@ declare 18 generic {
 }
 declare 19 generic {
     ClientData Tcl_ClassGetMetadata(Tcl_Class clazz,
-	    const Tcl_ObjectMetadataType *typePtr)
+	    CONST Tcl_ObjectMetadataType *typePtr)
 }
 declare 20 generic {
     void Tcl_ClassSetMetadata(Tcl_Class clazz,
-	    const Tcl_ObjectMetadataType *typePtr, ClientData metadata)
+	    CONST Tcl_ObjectMetadataType *typePtr, ClientData metadata)
 }
 declare 21 generic {
     ClientData Tcl_ObjectGetMetadata(Tcl_Object object,
-	    const Tcl_ObjectMetadataType *typePtr)
+	    CONST Tcl_ObjectMetadataType *typePtr)
 }
 declare 22 generic {
     void Tcl_ObjectSetMetadata(Tcl_Object object,
-	    const Tcl_ObjectMetadataType *typePtr, ClientData metadata)
+	    CONST Tcl_ObjectMetadataType *typePtr, ClientData metadata)
 }
 declare 23 generic {
     int Tcl_ObjectContextInvokeNext(Tcl_Interp *interp,
-	    Tcl_ObjectContext context, int objc, Tcl_Obj *const *objv,
+	    Tcl_ObjectContext context, int objc, Tcl_Obj *CONST *objv,
 	    int skip)
 }
 declare 24 generic {
@@ -118,13 +118,13 @@ declare 0 generic {
 declare 1 generic {
     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,
+	    CONST Tcl_MethodType *typePtr, ClientData clientData,
 	    Proc **procPtrPtr)
 }
 declare 2 generic {
     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,
+	    int flags, Tcl_Obj *nameObj, CONST char *namePtr,
+	    Tcl_Obj *argsObj, Tcl_Obj *bodyObj, CONST Tcl_MethodType *typePtr,
 	    ClientData clientData, Proc **procPtrPtr)
 }
 declare 3 generic {
@@ -139,7 +139,7 @@ declare 4 generic {
 }
 declare 5 generic {
     int TclOOObjectCmdCore(Object *oPtr, Tcl_Interp *interp, int objc,
-	    Tcl_Obj *const *objv, int publicOnly, Class *startCls)
+	    Tcl_Obj *CONST *objv, int publicOnly, Class *startCls)
 }
 declare 6 generic {
     int TclOOIsReachable(Class *targetPtr, Class *startPtr)
@@ -169,21 +169,21 @@ declare 10 generic {
 declare 11 generic {
     int TclOOInvokeObject(Tcl_Interp *interp, Tcl_Object object,
 	    Tcl_Class startCls, int publicPrivate, int objc,
-	    Tcl_Obj *const *objv)
+	    Tcl_Obj *CONST *objv)
 }
 declare 12 generic {
     void TclOOObjectSetFilters(Object *oPtr, int numFilters,
-	    Tcl_Obj *const *filters)
+	    Tcl_Obj *CONST *filters)
 }
 declare 13 generic {
     void TclOOClassSetFilters(Tcl_Interp *interp, Class *classPtr,
-	    int numFilters, Tcl_Obj *const *filters)
+	    int numFilters, Tcl_Obj *CONST *filters)
 }
 declare 14 generic {
     void TclOOObjectSetMixins(Object *oPtr, int numMixins,
-	    Class *const *mixins)
+	    Class *CONST *mixins)
 }
 declare 15 generic {
     void TclOOClassSetMixins(Tcl_Interp *interp, Class *classPtr,
-	    int numMixins, Class *const *mixins)
+	    int numMixins, Class *CONST *mixins)
 }
diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h
index 79629ce..c86267c 100644
--- a/generic/tclOODecls.h
+++ b/generic/tclOODecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOODecls.h,v 1.7 2008/07/22 23:01:37 das Exp $
+ * $Id: tclOODecls.h,v 1.8 2008/07/24 22:57:57 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  */
@@ -46,8 +46,8 @@ extern const char *TclOOInitializeStubs(Tcl_Interp *, const char *version);
 /* 0 */
 EXTERN Tcl_Object	Tcl_CopyObjectInstance (Tcl_Interp * interp, 
 				Tcl_Object sourceObject, 
-				const char * targetName, 
-				const char * targetNamespaceName);
+				CONST char * targetName, 
+				CONST char * targetNamespaceName);
 #endif
 #ifndef Tcl_GetClassAsObject_TCL_DECLARED
 #define Tcl_GetClassAsObject_TCL_DECLARED
@@ -94,7 +94,7 @@ EXTERN int		Tcl_MethodIsPublic (Tcl_Method method);
 #define Tcl_MethodIsType_TCL_DECLARED
 /* 9 */
 EXTERN int		Tcl_MethodIsType (Tcl_Method method, 
-				const Tcl_MethodType * typePtr, 
+				CONST Tcl_MethodType * typePtr, 
 				ClientData * clientDataPtr);
 #endif
 #ifndef Tcl_MethodName_TCL_DECLARED
@@ -107,7 +107,7 @@ EXTERN Tcl_Obj *	Tcl_MethodName (Tcl_Method method);
 /* 11 */
 EXTERN Tcl_Method	Tcl_NewInstanceMethod (Tcl_Interp * interp, 
 				Tcl_Object object, Tcl_Obj * nameObj, 
-				int isPublic, const Tcl_MethodType * typePtr, 
+				int isPublic, CONST Tcl_MethodType * typePtr, 
 				ClientData clientData);
 #endif
 #ifndef Tcl_NewMethod_TCL_DECLARED
@@ -115,16 +115,16 @@ EXTERN Tcl_Method	Tcl_NewInstanceMethod (Tcl_Interp * interp,
 /* 12 */
 EXTERN Tcl_Method	Tcl_NewMethod (Tcl_Interp * interp, Tcl_Class cls, 
 				Tcl_Obj * nameObj, int isPublic, 
-				const Tcl_MethodType * typePtr, 
+				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, 
-				Tcl_Obj *const * objv, int skip);
+				Tcl_Class cls, CONST char * nameStr, 
+				CONST char * nsNameStr, int objc, 
+				Tcl_Obj *CONST * objv, int skip);
 #endif
 #ifndef Tcl_ObjectDeleted_TCL_DECLARED
 #define Tcl_ObjectDeleted_TCL_DECLARED
@@ -157,26 +157,26 @@ EXTERN int		Tcl_ObjectContextSkippedArgs (
 #define Tcl_ClassGetMetadata_TCL_DECLARED
 /* 19 */
 EXTERN ClientData	Tcl_ClassGetMetadata (Tcl_Class clazz, 
-				const Tcl_ObjectMetadataType * typePtr);
+				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, 
+				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, 
-				const Tcl_ObjectMetadataType * typePtr);
+				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, 
+				CONST Tcl_ObjectMetadataType * typePtr, 
 				ClientData metadata);
 #endif
 #ifndef Tcl_ObjectContextInvokeNext_TCL_DECLARED
@@ -184,7 +184,7 @@ EXTERN void		Tcl_ObjectSetMetadata (Tcl_Object object,
 /* 23 */
 EXTERN int		Tcl_ObjectContextInvokeNext (Tcl_Interp * interp, 
 				Tcl_ObjectContext context, int objc, 
-				Tcl_Obj *const * objv, int skip);
+				Tcl_Obj *CONST * objv, int skip);
 #endif
 #ifndef Tcl_ObjectGetMethodNameMapper_TCL_DECLARED
 #define Tcl_ObjectGetMethodNameMapper_TCL_DECLARED
@@ -219,7 +219,7 @@ typedef struct TclOOStubs {
     int magic;
     CONST struct TclOOStubHooks *hooks;
 
-    Tcl_Object (*tcl_CopyObjectInstance) (Tcl_Interp * interp, Tcl_Object sourceObject, const char * targetName, const char * targetNamespaceName); /* 0 */
+    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 */
     Tcl_Class (*tcl_GetObjectAsClass) (Tcl_Object object); /* 2 */
     Tcl_Command (*tcl_GetObjectCommand) (Tcl_Object object); /* 3 */
@@ -228,21 +228,21 @@ typedef struct TclOOStubs {
     Tcl_Class (*tcl_MethodDeclarerClass) (Tcl_Method method); /* 6 */
     Tcl_Object (*tcl_MethodDeclarerObject) (Tcl_Method method); /* 7 */
     int (*tcl_MethodIsPublic) (Tcl_Method method); /* 8 */
-    int (*tcl_MethodIsType) (Tcl_Method method, const Tcl_MethodType * typePtr, ClientData * clientDataPtr); /* 9 */
+    int (*tcl_MethodIsType) (Tcl_Method method, CONST Tcl_MethodType * typePtr, ClientData * clientDataPtr); /* 9 */
     Tcl_Obj * (*tcl_MethodName) (Tcl_Method method); /* 10 */
-    Tcl_Method (*tcl_NewInstanceMethod) (Tcl_Interp * interp, Tcl_Object object, Tcl_Obj * nameObj, int isPublic, const Tcl_MethodType * typePtr, ClientData clientData); /* 11 */
-    Tcl_Method (*tcl_NewMethod) (Tcl_Interp * interp, Tcl_Class cls, Tcl_Obj * nameObj, int isPublic, const Tcl_MethodType * typePtr, ClientData clientData); /* 12 */
-    Tcl_Object (*tcl_NewObjectInstance) (Tcl_Interp * interp, Tcl_Class cls, const char * nameStr, const char * nsNameStr, int objc, Tcl_Obj *const * objv, int skip); /* 13 */
+    Tcl_Method (*tcl_NewInstanceMethod) (Tcl_Interp * interp, Tcl_Object object, Tcl_Obj * nameObj, int isPublic, CONST Tcl_MethodType * typePtr, ClientData clientData); /* 11 */
+    Tcl_Method (*tcl_NewMethod) (Tcl_Interp * interp, Tcl_Class cls, Tcl_Obj * nameObj, int isPublic, CONST Tcl_MethodType * typePtr, ClientData clientData); /* 12 */
+    Tcl_Object (*tcl_NewObjectInstance) (Tcl_Interp * interp, Tcl_Class cls, CONST char * nameStr, CONST char * nsNameStr, int objc, Tcl_Obj *CONST * objv, int skip); /* 13 */
     int (*tcl_ObjectDeleted) (Tcl_Object object); /* 14 */
     int (*tcl_ObjectContextIsFiltering) (Tcl_ObjectContext context); /* 15 */
     Tcl_Method (*tcl_ObjectContextMethod) (Tcl_ObjectContext context); /* 16 */
     Tcl_Object (*tcl_ObjectContextObject) (Tcl_ObjectContext context); /* 17 */
     int (*tcl_ObjectContextSkippedArgs) (Tcl_ObjectContext context); /* 18 */
-    ClientData (*tcl_ClassGetMetadata) (Tcl_Class clazz, const Tcl_ObjectMetadataType * typePtr); /* 19 */
-    void (*tcl_ClassSetMetadata) (Tcl_Class clazz, const Tcl_ObjectMetadataType * typePtr, ClientData metadata); /* 20 */
-    ClientData (*tcl_ObjectGetMetadata) (Tcl_Object object, const Tcl_ObjectMetadataType * typePtr); /* 21 */
-    void (*tcl_ObjectSetMetadata) (Tcl_Object object, const Tcl_ObjectMetadataType * typePtr, ClientData metadata); /* 22 */
-    int (*tcl_ObjectContextInvokeNext) (Tcl_Interp * interp, Tcl_ObjectContext context, int objc, Tcl_Obj *const * objv, int skip); /* 23 */
+    ClientData (*tcl_ClassGetMetadata) (Tcl_Class clazz, CONST Tcl_ObjectMetadataType * typePtr); /* 19 */
+    void (*tcl_ClassSetMetadata) (Tcl_Class clazz, CONST Tcl_ObjectMetadataType * typePtr, ClientData metadata); /* 20 */
+    ClientData (*tcl_ObjectGetMetadata) (Tcl_Object object, CONST Tcl_ObjectMetadataType * typePtr); /* 21 */
+    void (*tcl_ObjectSetMetadata) (Tcl_Object object, CONST Tcl_ObjectMetadataType * typePtr, ClientData metadata); /* 22 */
+    int (*tcl_ObjectContextInvokeNext) (Tcl_Interp * interp, Tcl_ObjectContext context, int objc, Tcl_Obj *CONST * objv, int skip); /* 23 */
     Tcl_ObjectMapMethodNameProc (*tcl_ObjectGetMethodNameMapper) (Tcl_Object object); /* 24 */
     void (*tcl_ObjectSetMethodNameMapper) (Tcl_Object object, Tcl_ObjectMapMethodNameProc mapMethodNameProc); /* 25 */
     void (*tcl_ClassSetConstructor) (Tcl_Interp * interp, Tcl_Class clazz, Tcl_Method method); /* 26 */
diff --git a/generic/tclOOIntDecls.h b/generic/tclOOIntDecls.h
index 4ee1788..680aa61 100644
--- a/generic/tclOOIntDecls.h
+++ b/generic/tclOOIntDecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOOIntDecls.h,v 1.7 2008/07/22 23:01:38 das Exp $
+ * $Id: tclOOIntDecls.h,v 1.8 2008/07/24 22:57:57 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  */
@@ -41,7 +41,7 @@ EXTERN Tcl_Object	TclOOGetDefineCmdContext (Tcl_Interp * interp);
 EXTERN Tcl_Method	TclOOMakeProcInstanceMethod (Tcl_Interp * interp, 
 				Object * oPtr, int flags, Tcl_Obj * nameObj, 
 				Tcl_Obj * argsObj, Tcl_Obj * bodyObj, 
-				const Tcl_MethodType * typePtr, 
+				CONST Tcl_MethodType * typePtr, 
 				ClientData clientData, Proc ** procPtrPtr);
 #endif
 #ifndef TclOOMakeProcMethod_TCL_DECLARED
@@ -49,9 +49,9 @@ EXTERN Tcl_Method	TclOOMakeProcInstanceMethod (Tcl_Interp * interp,
 /* 2 */
 EXTERN Tcl_Method	TclOOMakeProcMethod (Tcl_Interp * interp, 
 				Class * clsPtr, int flags, Tcl_Obj * nameObj, 
-				const char * namePtr, Tcl_Obj * argsObj, 
+				CONST char * namePtr, Tcl_Obj * argsObj, 
 				Tcl_Obj * bodyObj, 
-				const Tcl_MethodType * typePtr, 
+				CONST Tcl_MethodType * typePtr, 
 				ClientData clientData, Proc ** procPtrPtr);
 #endif
 #ifndef TclOONewProcInstanceMethod_TCL_DECLARED
@@ -75,7 +75,7 @@ EXTERN Method *		TclOONewProcMethod (Tcl_Interp * interp,
 /* 5 */
 EXTERN int		TclOOObjectCmdCore (Object * oPtr, 
 				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *const * objv, int publicOnly, 
+				Tcl_Obj *CONST * objv, int publicOnly, 
 				Class * startCls);
 #endif
 #ifndef TclOOIsReachable_TCL_DECLARED
@@ -128,33 +128,33 @@ EXTERN Tcl_Method	TclOONewProcMethodEx (Tcl_Interp * interp,
 EXTERN int		TclOOInvokeObject (Tcl_Interp * interp, 
 				Tcl_Object object, Tcl_Class startCls, 
 				int publicPrivate, int objc, 
-				Tcl_Obj *const * objv);
+				Tcl_Obj *CONST * objv);
 #endif
 #ifndef TclOOObjectSetFilters_TCL_DECLARED
 #define TclOOObjectSetFilters_TCL_DECLARED
 /* 12 */
 EXTERN void		TclOOObjectSetFilters (Object * oPtr, int numFilters, 
-				Tcl_Obj *const * filters);
+				Tcl_Obj *CONST * filters);
 #endif
 #ifndef TclOOClassSetFilters_TCL_DECLARED
 #define TclOOClassSetFilters_TCL_DECLARED
 /* 13 */
 EXTERN void		TclOOClassSetFilters (Tcl_Interp * interp, 
 				Class * classPtr, int numFilters, 
-				Tcl_Obj *const * filters);
+				Tcl_Obj *CONST * filters);
 #endif
 #ifndef TclOOObjectSetMixins_TCL_DECLARED
 #define TclOOObjectSetMixins_TCL_DECLARED
 /* 14 */
 EXTERN void		TclOOObjectSetMixins (Object * oPtr, int numMixins, 
-				Class *const * mixins);
+				Class *CONST * mixins);
 #endif
 #ifndef TclOOClassSetMixins_TCL_DECLARED
 #define TclOOClassSetMixins_TCL_DECLARED
 /* 15 */
 EXTERN void		TclOOClassSetMixins (Tcl_Interp * interp, 
 				Class * classPtr, int numMixins, 
-				Class *const * mixins);
+				Class *CONST * mixins);
 #endif
 
 typedef struct TclOOIntStubs {
@@ -162,21 +162,21 @@ typedef struct TclOOIntStubs {
     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 */
-    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); /* 2 */
+    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 */
+    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); /* 2 */
     Method * (*tclOONewProcInstanceMethod) (Tcl_Interp * interp, Object * oPtr, int flags, Tcl_Obj * nameObj, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, ProcedureMethod ** pmPtrPtr); /* 3 */
     Method * (*tclOONewProcMethod) (Tcl_Interp * interp, Class * clsPtr, int flags, Tcl_Obj * nameObj, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, ProcedureMethod ** pmPtrPtr); /* 4 */
-    int (*tclOOObjectCmdCore) (Object * oPtr, Tcl_Interp * interp, int objc, Tcl_Obj *const * objv, int publicOnly, Class * startCls); /* 5 */
+    int (*tclOOObjectCmdCore) (Object * oPtr, Tcl_Interp * interp, int objc, Tcl_Obj *CONST * objv, int publicOnly, Class * startCls); /* 5 */
     int (*tclOOIsReachable) (Class * targetPtr, Class * startPtr); /* 6 */
     Method * (*tclOONewForwardMethod) (Tcl_Interp * interp, Class * clsPtr, int isPublic, Tcl_Obj * nameObj, Tcl_Obj * prefixObj); /* 7 */
     Method * (*tclOONewForwardInstanceMethod) (Tcl_Interp * interp, Object * oPtr, int isPublic, Tcl_Obj * nameObj, Tcl_Obj * prefixObj); /* 8 */
     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); /* 9 */
     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); /* 10 */
-    int (*tclOOInvokeObject) (Tcl_Interp * interp, Tcl_Object object, Tcl_Class startCls, int publicPrivate, int objc, Tcl_Obj *const * objv); /* 11 */
-    void (*tclOOObjectSetFilters) (Object * oPtr, int numFilters, Tcl_Obj *const * filters); /* 12 */
-    void (*tclOOClassSetFilters) (Tcl_Interp * interp, Class * classPtr, int numFilters, Tcl_Obj *const * filters); /* 13 */
-    void (*tclOOObjectSetMixins) (Object * oPtr, int numMixins, Class *const * mixins); /* 14 */
-    void (*tclOOClassSetMixins) (Tcl_Interp * interp, Class * classPtr, int numMixins, Class *const * mixins); /* 15 */
+    int (*tclOOInvokeObject) (Tcl_Interp * interp, Tcl_Object object, Tcl_Class startCls, int publicPrivate, int objc, Tcl_Obj *CONST * objv); /* 11 */
+    void (*tclOOObjectSetFilters) (Object * oPtr, int numFilters, Tcl_Obj *CONST * filters); /* 12 */
+    void (*tclOOClassSetFilters) (Tcl_Interp * interp, Class * classPtr, int numFilters, Tcl_Obj *CONST * filters); /* 13 */
+    void (*tclOOObjectSetMixins) (Object * oPtr, int numMixins, Class *CONST * mixins); /* 14 */
+    void (*tclOOClassSetMixins) (Tcl_Interp * interp, Class * classPtr, int numMixins, Class *CONST * mixins); /* 15 */
 } TclOOIntStubs;
 
 #if defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS)
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index 7e89a39..9ace7fd 100644
--- a/generic/tclTomMath.decls
+++ b/generic/tclTomMath.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: tclTomMath.decls,v 1.3 2007/12/13 15:23:20 dgp Exp $
+# RCS: @(#) $Id: tclTomMath.decls,v 1.4 2008/07/24 22:57:56 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 548ceb1..203e90c 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.7 2008/07/22 23:01:44 das Exp $
+ * RCS: @(#) $Id: tclTomMathDecls.h,v 1.8 2008/07/24 22:57:57 nijtmans Exp $
  */
 
 #ifndef _TCLTOMMATHDECLS
@@ -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
@@ -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 */