clean-up tcl.decls the same way as tclInt.decls

1 files changed, 155 insertions, 152 deletions

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 02acced..c3b2d55 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -25,8 +25,8 @@
  */
 
 /* 0 */
-EXTERN int		Tcl_PkgProvideEx _ANSI_ARGS_((Tcl_Interp*interp,
-				CONST char*name, CONST char*version,
+EXTERN int		Tcl_PkgProvideEx _ANSI_ARGS_((Tcl_Interp *interp,
+				CONST char *name, CONST char *version,
 				ClientData clientData));
 /* 1 */
 EXTERN CONST84_RETURN char * Tcl_PkgRequireEx _ANSI_ARGS_((
@@ -73,8 +73,8 @@ EXTERN int		Tcl_AppendAllObjTypes _ANSI_ARGS_((
 /* 15 */
 EXTERN void		Tcl_AppendStringsToObj _ANSI_ARGS_(TCL_VARARGS(Tcl_Obj *,objPtr));
 /* 16 */
-EXTERN void		Tcl_AppendToObj _ANSI_ARGS_((Tcl_Obj*objPtr,
-				CONST char*bytes, int length));
+EXTERN void		Tcl_AppendToObj _ANSI_ARGS_((Tcl_Obj *objPtr,
+				CONST char *bytes, int length));
 /* 17 */
 EXTERN Tcl_Obj *	Tcl_ConcatObj _ANSI_ARGS_((int objc,
 				Tcl_Obj *CONST objv[]));
@@ -118,7 +118,7 @@ EXTERN Tcl_Obj *	Tcl_DuplicateObj _ANSI_ARGS_((Tcl_Obj *objPtr));
 EXTERN void		TclFreeObj _ANSI_ARGS_((Tcl_Obj *objPtr));
 /* 31 */
 EXTERN int		Tcl_GetBoolean _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *str, int *boolPtr));
+				CONST char *src, int *boolPtr));
 /* 32 */
 EXTERN int		Tcl_GetBooleanFromObj _ANSI_ARGS_((
 				Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -128,7 +128,7 @@ EXTERN unsigned char *	Tcl_GetByteArrayFromObj _ANSI_ARGS_((Tcl_Obj *objPtr,
 				int *lengthPtr));
 /* 34 */
 EXTERN int		Tcl_GetDouble _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *str, double *doublePtr));
+				CONST char *src, double *doublePtr));
 /* 35 */
 EXTERN int		Tcl_GetDoubleFromObj _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Obj *objPtr, double *doublePtr));
@@ -138,7 +138,7 @@ EXTERN int		Tcl_GetIndexFromObj _ANSI_ARGS_((Tcl_Interp *interp,
 				CONST char *msg, int flags, int *indexPtr));
 /* 37 */
 EXTERN int		Tcl_GetInt _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *str, int *intPtr));
+				CONST char *src, int *intPtr));
 /* 38 */
 EXTERN int		Tcl_GetIntFromObj _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *intPtr));
@@ -179,7 +179,7 @@ EXTERN int		Tcl_ListObjReplace _ANSI_ARGS_((Tcl_Interp *interp,
 EXTERN Tcl_Obj *	Tcl_NewBooleanObj _ANSI_ARGS_((int boolValue));
 /* 50 */
 EXTERN Tcl_Obj *	Tcl_NewByteArrayObj _ANSI_ARGS_((
-				CONST unsigned char*bytes, int length));
+				CONST unsigned char *bytes, int length));
 /* 51 */
 EXTERN Tcl_Obj *	Tcl_NewDoubleObj _ANSI_ARGS_((double doubleValue));
 /* 52 */
@@ -219,8 +219,8 @@ EXTERN void		Tcl_SetLongObj _ANSI_ARGS_((Tcl_Obj *objPtr,
 EXTERN void		Tcl_SetObjLength _ANSI_ARGS_((Tcl_Obj *objPtr,
 				int length));
 /* 65 */
-EXTERN void		Tcl_SetStringObj _ANSI_ARGS_((Tcl_Obj*objPtr,
-				CONST char*bytes, int length));
+EXTERN void		Tcl_SetStringObj _ANSI_ARGS_((Tcl_Obj *objPtr,
+				CONST char *bytes, int length));
 /* 66 */
 EXTERN void		Tcl_AddErrorInfo _ANSI_ARGS_((Tcl_Interp *interp,
 				CONST char *message));
@@ -231,7 +231,7 @@ EXTERN void		Tcl_AddObjErrorInfo _ANSI_ARGS_((Tcl_Interp *interp,
 EXTERN void		Tcl_AllowExceptions _ANSI_ARGS_((Tcl_Interp *interp));
 /* 69 */
 EXTERN void		Tcl_AppendElement _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *string));
+				CONST char *element));
 /* 70 */
 EXTERN void		Tcl_AppendResult _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp));
 /* 71 */
@@ -270,7 +270,7 @@ EXTERN int		Tcl_Close _ANSI_ARGS_((Tcl_Interp *interp,
 EXTERN int		Tcl_CommandComplete _ANSI_ARGS_((CONST char *cmd));
 /* 83 */
 EXTERN char *		Tcl_Concat _ANSI_ARGS_((int argc,
-				CONST84 char * CONST *argv));
+				CONST84 char *CONST *argv));
 /* 84 */
 EXTERN int		Tcl_ConvertElement _ANSI_ARGS_((CONST char *src,
 				char *dst, int flags));
@@ -282,7 +282,7 @@ EXTERN int		Tcl_ConvertCountedElement _ANSI_ARGS_((
 EXTERN int		Tcl_CreateAlias _ANSI_ARGS_((Tcl_Interp *slave,
 				CONST char *slaveCmd, Tcl_Interp *target,
 				CONST char *targetCmd, int argc,
-				CONST84 char * CONST *argv));
+				CONST84 char *CONST *argv));
 /* 87 */
 EXTERN int		Tcl_CreateAliasObj _ANSI_ARGS_((Tcl_Interp *slave,
 				CONST char *slaveCmd, Tcl_Interp *target,
@@ -399,10 +399,10 @@ EXTERN void		Tcl_DoWhenIdle _ANSI_ARGS_((Tcl_IdleProc *proc,
 				ClientData clientData));
 /* 117 */
 EXTERN char *		Tcl_DStringAppend _ANSI_ARGS_((Tcl_DString *dsPtr,
-				CONST char *str, int length));
+				CONST char *bytes, int length));
 /* 118 */
 EXTERN char *		Tcl_DStringAppendElement _ANSI_ARGS_((
-				Tcl_DString *dsPtr, CONST char *string));
+				Tcl_DString *dsPtr, CONST char *element));
 /* 119 */
 EXTERN void		Tcl_DStringEndSublist _ANSI_ARGS_((
 				Tcl_DString *dsPtr));
@@ -430,7 +430,7 @@ EXTERN CONST84_RETURN char * Tcl_ErrnoId _ANSI_ARGS_((void));
 EXTERN CONST84_RETURN char * Tcl_ErrnoMsg _ANSI_ARGS_((int err));
 /* 129 */
 EXTERN int		Tcl_Eval _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *string));
+				CONST char *script));
 /* 130 */
 EXTERN int		Tcl_EvalFile _ANSI_ARGS_((Tcl_Interp *interp,
 				CONST char *fileName));
@@ -449,19 +449,19 @@ EXTERN int		Tcl_ExposeCommand _ANSI_ARGS_((Tcl_Interp *interp,
 				CONST char *cmdName));
 /* 135 */
 EXTERN int		Tcl_ExprBoolean _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *str, int *ptr));
+				CONST char *expr, int *ptr));
 /* 136 */
 EXTERN int		Tcl_ExprBooleanObj _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *ptr));
 /* 137 */
 EXTERN int		Tcl_ExprDouble _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *str, double *ptr));
+				CONST char *expr, double *ptr));
 /* 138 */
 EXTERN int		Tcl_ExprDoubleObj _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Obj *objPtr, double *ptr));
 /* 139 */
 EXTERN int		Tcl_ExprLong _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *str, long *ptr));
+				CONST char *expr, long *ptr));
 /* 140 */
 EXTERN int		Tcl_ExprLongObj _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Obj *objPtr, long *ptr));
@@ -470,7 +470,7 @@ EXTERN int		Tcl_ExprObj _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_Obj **resultPtrPtr));
 /* 142 */
 EXTERN int		Tcl_ExprString _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *string));
+				CONST char *expr));
 /* 143 */
 EXTERN void		Tcl_Finalize _ANSI_ARGS_((void));
 /* 144 */
@@ -544,7 +544,7 @@ EXTERN Tcl_Obj *	Tcl_GetObjResult _ANSI_ARGS_((Tcl_Interp *interp));
 #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
 /* 167 */
 EXTERN int		Tcl_GetOpenFile _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *str, int forWriting,
+				CONST char *chanID, int forWriting,
 				int checkUsage, ClientData *filePtr));
 #endif /* UNIX */
 /* 168 */
@@ -597,7 +597,7 @@ EXTERN int		Tcl_InterpDeleted _ANSI_ARGS_((Tcl_Interp *interp));
 EXTERN int		Tcl_IsSafe _ANSI_ARGS_((Tcl_Interp *interp));
 /* 186 */
 EXTERN char *		Tcl_JoinPath _ANSI_ARGS_((int argc,
-				CONST84 char * CONST *argv,
+				CONST84 char *CONST *argv,
 				Tcl_DString *resultPtr));
 /* 187 */
 EXTERN int		Tcl_LinkVar _ANSI_ARGS_((Tcl_Interp *interp,
@@ -613,7 +613,7 @@ EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel _ANSI_ARGS_((
 				ClientData tcpSocket));
 /* 192 */
 EXTERN char *		Tcl_Merge _ANSI_ARGS_((int argc,
-				CONST84 char * CONST *argv));
+				CONST84 char *CONST *argv));
 /* 193 */
 EXTERN Tcl_HashEntry *	Tcl_NextHashEntry _ANSI_ARGS_((
 				Tcl_HashSearch *searchPtr));
@@ -659,7 +659,7 @@ EXTERN void		Tcl_Preserve _ANSI_ARGS_((ClientData data));
 EXTERN void		Tcl_PrintDouble _ANSI_ARGS_((Tcl_Interp *interp,
 				double value, char *dst));
 /* 203 */
-EXTERN int		Tcl_PutEnv _ANSI_ARGS_((CONST char *string));
+EXTERN int		Tcl_PutEnv _ANSI_ARGS_((CONST char *assignment));
 /* 204 */
 EXTERN CONST84_RETURN char * Tcl_PosixError _ANSI_ARGS_((Tcl_Interp *interp));
 /* 205 */
@@ -690,14 +690,14 @@ EXTERN void		Tcl_RegisterObjType _ANSI_ARGS_((
 				Tcl_ObjType *typePtr));
 /* 212 */
 EXTERN Tcl_RegExp	Tcl_RegExpCompile _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *string));
+				CONST char *pattern));
 /* 213 */
 EXTERN int		Tcl_RegExpExec _ANSI_ARGS_((Tcl_Interp *interp,
-				Tcl_RegExp regexp, CONST char *str,
+				Tcl_RegExp regexp, CONST char *text,
 				CONST char *start));
 /* 214 */
 EXTERN int		Tcl_RegExpMatch _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *str, CONST char *pattern));
+				CONST char *text, CONST char *pattern));
 /* 215 */
 EXTERN void		Tcl_RegExpRange _ANSI_ARGS_((Tcl_RegExp regexp,
 				int index, CONST84 char **startPtr,
@@ -707,10 +707,10 @@ EXTERN void		Tcl_Release _ANSI_ARGS_((ClientData clientData));
 /* 217 */
 EXTERN void		Tcl_ResetResult _ANSI_ARGS_((Tcl_Interp *interp));
 /* 218 */
-EXTERN int		Tcl_ScanElement _ANSI_ARGS_((CONST char *str,
+EXTERN int		Tcl_ScanElement _ANSI_ARGS_((CONST char *src,
 				int *flagPtr));
 /* 219 */
-EXTERN int		Tcl_ScanCountedElement _ANSI_ARGS_((CONST char *str,
+EXTERN int		Tcl_ScanCountedElement _ANSI_ARGS_((CONST char *src,
 				int length, int *flagPtr));
 /* 220 */
 EXTERN int		Tcl_SeekOld _ANSI_ARGS_((Tcl_Channel chan,
@@ -748,7 +748,7 @@ EXTERN int		Tcl_SetRecursionLimit _ANSI_ARGS_((
 				Tcl_Interp *interp, int depth));
 /* 232 */
 EXTERN void		Tcl_SetResult _ANSI_ARGS_((Tcl_Interp *interp,
-				char *str, Tcl_FreeProc *freeProc));
+				char *result, Tcl_FreeProc *freeProc));
 /* 233 */
 EXTERN int		Tcl_SetServiceMode _ANSI_ARGS_((int mode));
 /* 234 */
@@ -878,7 +878,7 @@ EXTERN void		Tcl_AppendStringsToObjVA _ANSI_ARGS_((
 EXTERN char *		Tcl_HashStats _ANSI_ARGS_((Tcl_HashTable *tablePtr));
 /* 270 */
 EXTERN CONST84_RETURN char * Tcl_ParseVar _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *str, CONST84 char **termPtr));
+				CONST char *start, CONST84 char **termPtr));
 /* 271 */
 EXTERN CONST84_RETURN char * Tcl_PkgPresent _ANSI_ARGS_((Tcl_Interp *interp,
 				CONST char *name, CONST char *version,
@@ -1006,7 +1006,7 @@ EXTERN void		Tcl_ConditionWait _ANSI_ARGS_((
 				Tcl_Time *timePtr));
 /* 312 */
 EXTERN int		Tcl_NumUtfChars _ANSI_ARGS_((CONST char *src,
-				int len));
+				int length));
 /* 313 */
 EXTERN int		Tcl_ReadChars _ANSI_ARGS_((Tcl_Channel channel,
 				Tcl_Obj *objPtr, int charsToRead,
@@ -1028,7 +1028,7 @@ EXTERN Tcl_Obj *	Tcl_SetVar2Ex _ANSI_ARGS_((Tcl_Interp *interp,
 EXTERN void		Tcl_ThreadAlert _ANSI_ARGS_((Tcl_ThreadId threadId));
 /* 319 */
 EXTERN void		Tcl_ThreadQueueEvent _ANSI_ARGS_((
-				Tcl_ThreadId threadId, Tcl_Event*evPtr,
+				Tcl_ThreadId threadId, Tcl_Event *evPtr,
 				Tcl_QueuePosition position));
 /* 320 */
 EXTERN Tcl_UniChar	Tcl_UniCharAtIndex _ANSI_ARGS_((CONST char *src,
@@ -1046,7 +1046,7 @@ EXTERN CONST84_RETURN char * Tcl_UtfAtIndex _ANSI_ARGS_((CONST char *src,
 				int index));
 /* 326 */
 EXTERN int		Tcl_UtfCharComplete _ANSI_ARGS_((CONST char *src,
-				int len));
+				int length));
 /* 327 */
 EXTERN int		Tcl_UtfBackslash _ANSI_ARGS_((CONST char *src,
 				int *readPtr, char *dst));
@@ -1113,18 +1113,19 @@ EXTERN int		Tcl_UniCharIsUpper _ANSI_ARGS_((int ch));
 /* 351 */
 EXTERN int		Tcl_UniCharIsWordChar _ANSI_ARGS_((int ch));
 /* 352 */
-EXTERN int		Tcl_UniCharLen _ANSI_ARGS_((CONST Tcl_UniChar *str));
+EXTERN int		Tcl_UniCharLen _ANSI_ARGS_((
+				CONST Tcl_UniChar *uniStr));
 /* 353 */
-EXTERN int		Tcl_UniCharNcmp _ANSI_ARGS_((CONST Tcl_UniChar *cs,
-				CONST Tcl_UniChar *ct, unsigned long n));
+EXTERN int		Tcl_UniCharNcmp _ANSI_ARGS_((CONST Tcl_UniChar *ucs,
+				CONST Tcl_UniChar *uct,
+				unsigned long numChars));
 /* 354 */
 EXTERN char *		Tcl_UniCharToUtfDString _ANSI_ARGS_((
-				CONST Tcl_UniChar *string, int numChars,
+				CONST Tcl_UniChar *uniStr, int uniLength,
 				Tcl_DString *dsPtr));
 /* 355 */
-EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString _ANSI_ARGS_((
-				CONST char *string, int length,
-				Tcl_DString *dsPtr));
+EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString _ANSI_ARGS_((CONST char *src,
+				int length, Tcl_DString *dsPtr));
 /* 356 */
 EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Obj *patObj, int flags));
@@ -1139,25 +1140,25 @@ EXTERN void		Tcl_LogCommandInfo _ANSI_ARGS_((Tcl_Interp *interp,
 				int length));
 /* 360 */
 EXTERN int		Tcl_ParseBraces _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *string, int numBytes,
+				CONST char *start, int numBytes,
 				Tcl_Parse *parsePtr, int append,
 				CONST84 char **termPtr));
 /* 361 */
 EXTERN int		Tcl_ParseCommand _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *string, int numBytes, int nested,
+				CONST char *start, int numBytes, int nested,
 				Tcl_Parse *parsePtr));
 /* 362 */
 EXTERN int		Tcl_ParseExpr _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *string, int numBytes,
+				CONST char *start, int numBytes,
 				Tcl_Parse *parsePtr));
 /* 363 */
 EXTERN int		Tcl_ParseQuotedString _ANSI_ARGS_((
-				Tcl_Interp *interp, CONST char *string,
+				Tcl_Interp *interp, CONST char *start,
 				int numBytes, Tcl_Parse *parsePtr,
 				int append, CONST84 char **termPtr));
 /* 364 */
 EXTERN int		Tcl_ParseVarName _ANSI_ARGS_((Tcl_Interp *interp,
-				CONST char *string, int numBytes,
+				CONST char *start, int numBytes,
 				Tcl_Parse *parsePtr, int append));
 /* 365 */
 EXTERN char *		Tcl_GetCwd _ANSI_ARGS_((Tcl_Interp *interp,
@@ -1188,7 +1189,7 @@ EXTERN int		Tcl_UniCharIsPrint _ANSI_ARGS_((int ch));
 EXTERN int		Tcl_UniCharIsPunct _ANSI_ARGS_((int ch));
 /* 376 */
 EXTERN int		Tcl_RegExpExecObj _ANSI_ARGS_((Tcl_Interp *interp,
-				Tcl_RegExp regexp, Tcl_Obj *objPtr,
+				Tcl_RegExp regexp, Tcl_Obj *textObj,
 				int offset, int nmatches, int flags));
 /* 377 */
 EXTERN void		Tcl_RegExpGetInfo _ANSI_ARGS_((Tcl_RegExp regexp,
@@ -1214,7 +1215,7 @@ EXTERN void		Tcl_AppendUnicodeToObj _ANSI_ARGS_((Tcl_Obj *objPtr,
 				CONST Tcl_UniChar *unicode, int length));
 /* 385 */
 EXTERN int		Tcl_RegExpMatchObj _ANSI_ARGS_((Tcl_Interp *interp,
-				Tcl_Obj *stringObj, Tcl_Obj *patternObj));
+				Tcl_Obj *textObj, Tcl_Obj *patternObj));
 /* 386 */
 EXTERN void		Tcl_SetNotifier _ANSI_ARGS_((
 				Tcl_NotifierProcs *notifierProcPtr));
@@ -1293,12 +1294,12 @@ EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc _ANSI_ARGS_((
 				Tcl_ChannelType *chanTypePtr));
 /* 412 */
 EXTERN int		Tcl_JoinThread _ANSI_ARGS_((Tcl_ThreadId threadId,
-				int*result));
+				int *result));
 /* 413 */
 EXTERN int		Tcl_IsChannelShared _ANSI_ARGS_((Tcl_Channel channel));
 /* 414 */
 EXTERN int		Tcl_IsChannelRegistered _ANSI_ARGS_((
-				Tcl_Interp*interp, Tcl_Channel channel));
+				Tcl_Interp *interp, Tcl_Channel channel));
 /* 415 */
 EXTERN void		Tcl_CutChannel _ANSI_ARGS_((Tcl_Channel channel));
 /* 416 */
@@ -1308,15 +1309,16 @@ EXTERN void		Tcl_ClearChannelHandlers _ANSI_ARGS_((
 				Tcl_Channel channel));
 /* 418 */
 EXTERN int		Tcl_IsChannelExisting _ANSI_ARGS_((
-				CONST char*channelName));
+				CONST char *channelName));
 /* 419 */
 EXTERN int		Tcl_UniCharNcasecmp _ANSI_ARGS_((
-				CONST Tcl_UniChar *cs, CONST Tcl_UniChar *ct,
-				unsigned long n));
+				CONST Tcl_UniChar *ucs,
+				CONST Tcl_UniChar *uct,
+				unsigned long numChars));
 /* 420 */
 EXTERN int		Tcl_UniCharCaseMatch _ANSI_ARGS_((
-				CONST Tcl_UniChar *ustr,
-				CONST Tcl_UniChar *pattern, int nocase));
+				CONST Tcl_UniChar *uniStr,
+				CONST Tcl_UniChar *uniPattern, int nocase));
 /* 421 */
 EXTERN Tcl_HashEntry *	Tcl_FindHashEntry _ANSI_ARGS_((
 				Tcl_HashTable *tablePtr, CONST char *key));
@@ -1380,7 +1382,7 @@ EXTERN Tcl_Obj *	Tcl_ListMathFuncs _ANSI_ARGS_((Tcl_Interp *interp,
 EXTERN Tcl_Obj *	Tcl_SubstObj _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int flags));
 /* 438 */
-EXTERN int		Tcl_DetachChannel _ANSI_ARGS_((Tcl_Interp*interp,
+EXTERN int		Tcl_DetachChannel _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Channel channel));
 /* 439 */
 EXTERN int		Tcl_IsStandardChannel _ANSI_ARGS_((
@@ -1443,48 +1445,48 @@ EXTERN Tcl_Channel	Tcl_FSOpenFileChannel _ANSI_ARGS_((
 				Tcl_Interp *interp, Tcl_Obj *pathPtr,
 				CONST char *modeString, int permissions));
 /* 457 */
-EXTERN Tcl_Obj*		Tcl_FSGetCwd _ANSI_ARGS_((Tcl_Interp *interp));
+EXTERN Tcl_Obj *	Tcl_FSGetCwd _ANSI_ARGS_((Tcl_Interp *interp));
 /* 458 */
 EXTERN int		Tcl_FSChdir _ANSI_ARGS_((Tcl_Obj *pathPtr));
 /* 459 */
 EXTERN int		Tcl_FSConvertToPathType _ANSI_ARGS_((
 				Tcl_Interp *interp, Tcl_Obj *pathPtr));
 /* 460 */
-EXTERN Tcl_Obj*		Tcl_FSJoinPath _ANSI_ARGS_((Tcl_Obj *listObj,
+EXTERN Tcl_Obj *	Tcl_FSJoinPath _ANSI_ARGS_((Tcl_Obj *listObj,
 				int elements));
 /* 461 */
-EXTERN Tcl_Obj*		Tcl_FSSplitPath _ANSI_ARGS_((Tcl_Obj*pathPtr,
+EXTERN Tcl_Obj *	Tcl_FSSplitPath _ANSI_ARGS_((Tcl_Obj *pathPtr,
 				int *lenPtr));
 /* 462 */
-EXTERN int		Tcl_FSEqualPaths _ANSI_ARGS_((Tcl_Obj*firstPtr,
-				Tcl_Obj*secondPtr));
+EXTERN int		Tcl_FSEqualPaths _ANSI_ARGS_((Tcl_Obj *firstPtr,
+				Tcl_Obj *secondPtr));
 /* 463 */
-EXTERN Tcl_Obj*		Tcl_FSGetNormalizedPath _ANSI_ARGS_((
-				Tcl_Interp *interp, Tcl_Obj*pathObjPtr));
+EXTERN Tcl_Obj *	Tcl_FSGetNormalizedPath _ANSI_ARGS_((
+				Tcl_Interp *interp, Tcl_Obj *pathPtr));
 /* 464 */
-EXTERN Tcl_Obj*		Tcl_FSJoinToPath _ANSI_ARGS_((Tcl_Obj *basePtr,
+EXTERN Tcl_Obj *	Tcl_FSJoinToPath _ANSI_ARGS_((Tcl_Obj *pathPtr,
 				int objc, Tcl_Obj *CONST objv[]));
 /* 465 */
-EXTERN ClientData	Tcl_FSGetInternalRep _ANSI_ARGS_((Tcl_Obj*pathObjPtr,
+EXTERN ClientData	Tcl_FSGetInternalRep _ANSI_ARGS_((Tcl_Obj *pathPtr,
 				Tcl_Filesystem *fsPtr));
 /* 466 */
-EXTERN Tcl_Obj*		Tcl_FSGetTranslatedPath _ANSI_ARGS_((
-				Tcl_Interp *interp, Tcl_Obj*pathPtr));
+EXTERN Tcl_Obj *	Tcl_FSGetTranslatedPath _ANSI_ARGS_((
+				Tcl_Interp *interp, Tcl_Obj *pathPtr));
 /* 467 */
 EXTERN int		Tcl_FSEvalFile _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Obj *fileName));
 /* 468 */
-EXTERN Tcl_Obj*		Tcl_FSNewNativePath _ANSI_ARGS_((
-				Tcl_Filesystem*fromFilesystem,
+EXTERN Tcl_Obj *	Tcl_FSNewNativePath _ANSI_ARGS_((
+				Tcl_Filesystem *fromFilesystem,
 				ClientData clientData));
 /* 469 */
-EXTERN CONST char*	Tcl_FSGetNativePath _ANSI_ARGS_((Tcl_Obj*pathObjPtr));
+EXTERN CONST char *	Tcl_FSGetNativePath _ANSI_ARGS_((Tcl_Obj *pathPtr));
 /* 470 */
-EXTERN Tcl_Obj*		Tcl_FSFileSystemInfo _ANSI_ARGS_((Tcl_Obj*pathObjPtr));
+EXTERN Tcl_Obj *	Tcl_FSFileSystemInfo _ANSI_ARGS_((Tcl_Obj *pathPtr));
 /* 471 */
-EXTERN Tcl_Obj*		Tcl_FSPathSeparator _ANSI_ARGS_((Tcl_Obj*pathObjPtr));
+EXTERN Tcl_Obj *	Tcl_FSPathSeparator _ANSI_ARGS_((Tcl_Obj *pathPtr));
 /* 472 */
-EXTERN Tcl_Obj*		Tcl_FSListVolumes _ANSI_ARGS_((void));
+EXTERN Tcl_Obj *	Tcl_FSListVolumes _ANSI_ARGS_((void));
 /* 473 */
 EXTERN int		Tcl_FSRegister _ANSI_ARGS_((ClientData clientData,
 				Tcl_Filesystem *fsPtr));
@@ -1493,13 +1495,13 @@ EXTERN int		Tcl_FSUnregister _ANSI_ARGS_((Tcl_Filesystem *fsPtr));
 /* 475 */
 EXTERN ClientData	Tcl_FSData _ANSI_ARGS_((Tcl_Filesystem *fsPtr));
 /* 476 */
-EXTERN CONST char*	Tcl_FSGetTranslatedStringPath _ANSI_ARGS_((
-				Tcl_Interp *interp, Tcl_Obj*pathPtr));
+EXTERN CONST char *	Tcl_FSGetTranslatedStringPath _ANSI_ARGS_((
+				Tcl_Interp *interp, Tcl_Obj *pathPtr));
 /* 477 */
-EXTERN Tcl_Filesystem*	Tcl_FSGetFileSystemForPath _ANSI_ARGS_((
-				Tcl_Obj*pathObjPtr));
+EXTERN Tcl_Filesystem *	 Tcl_FSGetFileSystemForPath _ANSI_ARGS_((
+				Tcl_Obj *pathPtr));
 /* 478 */
-EXTERN Tcl_PathType	Tcl_FSGetPathType _ANSI_ARGS_((Tcl_Obj *pathObjPtr));
+EXTERN Tcl_PathType	Tcl_FSGetPathType _ANSI_ARGS_((Tcl_Obj *pathPtr));
 /* 479 */
 EXTERN int		Tcl_OutputBuffered _ANSI_ARGS_((Tcl_Channel chan));
 /* 480 */
@@ -1510,19 +1512,20 @@ EXTERN int		Tcl_EvalTokensStandard _ANSI_ARGS_((
 				Tcl_Interp *interp, Tcl_Token *tokenPtr,
 				int count));
 /* 482 */
-EXTERN void		Tcl_GetTime _ANSI_ARGS_((Tcl_Time*timeBuf));
+EXTERN void		Tcl_GetTime _ANSI_ARGS_((Tcl_Time *timeBuf));
 /* 483 */
-EXTERN Tcl_Trace	Tcl_CreateObjTrace _ANSI_ARGS_((Tcl_Interp*interp,
+EXTERN Tcl_Trace	Tcl_CreateObjTrace _ANSI_ARGS_((Tcl_Interp *interp,
 				int level, int flags,
-				Tcl_CmdObjTraceProc*objProc,
+				Tcl_CmdObjTraceProc *objProc,
 				ClientData clientData,
-				Tcl_CmdObjTraceDeleteProc*delProc));
+				Tcl_CmdObjTraceDeleteProc *delProc));
 /* 484 */
 EXTERN int		Tcl_GetCommandInfoFromToken _ANSI_ARGS_((
-				Tcl_Command token, Tcl_CmdInfo*infoPtr));
+				Tcl_Command token, Tcl_CmdInfo *infoPtr));
 /* 485 */
 EXTERN int		Tcl_SetCommandInfoFromToken _ANSI_ARGS_((
-				Tcl_Command token, CONST Tcl_CmdInfo*infoPtr));
+				Tcl_Command token,
+				CONST Tcl_CmdInfo *infoPtr));
 /* 486 */
 EXTERN Tcl_Obj *	Tcl_DbNewWideIntObj _ANSI_ARGS_((
 				Tcl_WideInt wideValue, CONST char *file,
@@ -1643,7 +1646,7 @@ typedef struct TclStubs {
     int magic;
     struct TclStubHooks *hooks;
 
-    int (*tcl_PkgProvideEx) _ANSI_ARGS_((Tcl_Interp*interp, CONST char*name, CONST char*version, ClientData clientData)); /* 0 */
+    int (*tcl_PkgProvideEx) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, CONST char *version, ClientData clientData)); /* 0 */
     CONST84_RETURN char * (*tcl_PkgRequireEx) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, CONST char *version, int exact, ClientData *clientDataPtr)); /* 1 */
     void (*tcl_Panic) _ANSI_ARGS_(TCL_VARARGS(CONST char *,format)); /* 2 */
     char * (*tcl_Alloc) _ANSI_ARGS_((unsigned int size)); /* 3 */
@@ -1675,7 +1678,7 @@ typedef struct TclStubs {
     int (*tcl_WaitForEvent) _ANSI_ARGS_((Tcl_Time *timePtr)); /* 13 */
     int (*tcl_AppendAllObjTypes) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr)); /* 14 */
     void (*tcl_AppendStringsToObj) _ANSI_ARGS_(TCL_VARARGS(Tcl_Obj *,objPtr)); /* 15 */
-    void (*tcl_AppendToObj) _ANSI_ARGS_((Tcl_Obj*objPtr, CONST char*bytes, int length)); /* 16 */
+    void (*tcl_AppendToObj) _ANSI_ARGS_((Tcl_Obj *objPtr, CONST char *bytes, int length)); /* 16 */
     Tcl_Obj * (*tcl_ConcatObj) _ANSI_ARGS_((int objc, Tcl_Obj *CONST objv[])); /* 17 */
     int (*tcl_ConvertToType) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_ObjType *typePtr)); /* 18 */
     void (*tcl_DbDecrRefCount) _ANSI_ARGS_((Tcl_Obj *objPtr, CONST char *file, int line)); /* 19 */
@@ -1690,13 +1693,13 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_DbNewStringObj) _ANSI_ARGS_((CONST char *bytes, int length, CONST char *file, int line)); /* 28 */
     Tcl_Obj * (*tcl_DuplicateObj) _ANSI_ARGS_((Tcl_Obj *objPtr)); /* 29 */
     void (*tclFreeObj) _ANSI_ARGS_((Tcl_Obj *objPtr)); /* 30 */
-    int (*tcl_GetBoolean) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, int *boolPtr)); /* 31 */
+    int (*tcl_GetBoolean) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *src, int *boolPtr)); /* 31 */
     int (*tcl_GetBooleanFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, int *boolPtr)); /* 32 */
     unsigned char * (*tcl_GetByteArrayFromObj) _ANSI_ARGS_((Tcl_Obj *objPtr, int *lengthPtr)); /* 33 */
-    int (*tcl_GetDouble) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, double *doublePtr)); /* 34 */
+    int (*tcl_GetDouble) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *src, double *doublePtr)); /* 34 */
     int (*tcl_GetDoubleFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr)); /* 35 */
     int (*tcl_GetIndexFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, CONST84 char **tablePtr, CONST char *msg, int flags, int *indexPtr)); /* 36 */
-    int (*tcl_GetInt) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, int *intPtr)); /* 37 */
+    int (*tcl_GetInt) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *src, int *intPtr)); /* 37 */
     int (*tcl_GetIntFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr)); /* 38 */
     int (*tcl_GetLongFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, long *longPtr)); /* 39 */
     Tcl_ObjType * (*tcl_GetObjType) _ANSI_ARGS_((CONST char *typeName)); /* 40 */
@@ -1709,7 +1712,7 @@ typedef struct TclStubs {
     int (*tcl_ListObjLength) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *listPtr, int *lengthPtr)); /* 47 */
     int (*tcl_ListObjReplace) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *listPtr, int first, int count, int objc, Tcl_Obj *CONST objv[])); /* 48 */
     Tcl_Obj * (*tcl_NewBooleanObj) _ANSI_ARGS_((int boolValue)); /* 49 */
-    Tcl_Obj * (*tcl_NewByteArrayObj) _ANSI_ARGS_((CONST unsigned char*bytes, int length)); /* 50 */
+    Tcl_Obj * (*tcl_NewByteArrayObj) _ANSI_ARGS_((CONST unsigned char *bytes, int length)); /* 50 */
     Tcl_Obj * (*tcl_NewDoubleObj) _ANSI_ARGS_((double doubleValue)); /* 51 */
     Tcl_Obj * (*tcl_NewIntObj) _ANSI_ARGS_((int intValue)); /* 52 */
     Tcl_Obj * (*tcl_NewListObj) _ANSI_ARGS_((int objc, Tcl_Obj *CONST objv[])); /* 53 */
@@ -1724,11 +1727,11 @@ typedef struct TclStubs {
     void (*tcl_SetListObj) _ANSI_ARGS_((Tcl_Obj *objPtr, int objc, Tcl_Obj *CONST objv[])); /* 62 */
     void (*tcl_SetLongObj) _ANSI_ARGS_((Tcl_Obj *objPtr, long longValue)); /* 63 */
     void (*tcl_SetObjLength) _ANSI_ARGS_((Tcl_Obj *objPtr, int length)); /* 64 */
-    void (*tcl_SetStringObj) _ANSI_ARGS_((Tcl_Obj*objPtr, CONST char*bytes, int length)); /* 65 */
+    void (*tcl_SetStringObj) _ANSI_ARGS_((Tcl_Obj *objPtr, CONST char *bytes, int length)); /* 65 */
     void (*tcl_AddErrorInfo) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *message)); /* 66 */
     void (*tcl_AddObjErrorInfo) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *message, int length)); /* 67 */
     void (*tcl_AllowExceptions) _ANSI_ARGS_((Tcl_Interp *interp)); /* 68 */
-    void (*tcl_AppendElement) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string)); /* 69 */
+    void (*tcl_AppendElement) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *element)); /* 69 */
     void (*tcl_AppendResult) _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp)); /* 70 */
     Tcl_AsyncHandler (*tcl_AsyncCreate) _ANSI_ARGS_((Tcl_AsyncProc *proc, ClientData clientData)); /* 71 */
     void (*tcl_AsyncDelete) _ANSI_ARGS_((Tcl_AsyncHandler async)); /* 72 */
@@ -1742,10 +1745,10 @@ typedef struct TclStubs {
     void (*tcl_CancelIdleCall) _ANSI_ARGS_((Tcl_IdleProc *idleProc, ClientData clientData)); /* 80 */
     int (*tcl_Close) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Channel chan)); /* 81 */
     int (*tcl_CommandComplete) _ANSI_ARGS_((CONST char *cmd)); /* 82 */
-    char * (*tcl_Concat) _ANSI_ARGS_((int argc, CONST84 char * CONST *argv)); /* 83 */
+    char * (*tcl_Concat) _ANSI_ARGS_((int argc, CONST84 char *CONST *argv)); /* 83 */
     int (*tcl_ConvertElement) _ANSI_ARGS_((CONST char *src, char *dst, int flags)); /* 84 */
     int (*tcl_ConvertCountedElement) _ANSI_ARGS_((CONST char *src, int length, char *dst, int flags)); /* 85 */
-    int (*tcl_CreateAlias) _ANSI_ARGS_((Tcl_Interp *slave, CONST char *slaveCmd, Tcl_Interp *target, CONST char *targetCmd, int argc, CONST84 char * CONST *argv)); /* 86 */
+    int (*tcl_CreateAlias) _ANSI_ARGS_((Tcl_Interp *slave, CONST char *slaveCmd, Tcl_Interp *target, CONST char *targetCmd, int argc, CONST84 char *CONST *argv)); /* 86 */
     int (*tcl_CreateAliasObj) _ANSI_ARGS_((Tcl_Interp *slave, CONST char *slaveCmd, Tcl_Interp *target, CONST char *targetCmd, int objc, Tcl_Obj *CONST objv[])); /* 87 */
     Tcl_Channel (*tcl_CreateChannel) _ANSI_ARGS_((Tcl_ChannelType *typePtr, CONST char *chanName, ClientData instanceData, int mask)); /* 88 */
     void (*tcl_CreateChannelHandler) _ANSI_ARGS_((Tcl_Channel chan, int mask, Tcl_ChannelProc *proc, ClientData clientData)); /* 89 */
@@ -1784,8 +1787,8 @@ typedef struct TclStubs {
     void (*tcl_DontCallWhenDeleted) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, ClientData clientData)); /* 114 */
     int (*tcl_DoOneEvent) _ANSI_ARGS_((int flags)); /* 115 */
     void (*tcl_DoWhenIdle) _ANSI_ARGS_((Tcl_IdleProc *proc, ClientData clientData)); /* 116 */
-    char * (*tcl_DStringAppend) _ANSI_ARGS_((Tcl_DString *dsPtr, CONST char *str, int length)); /* 117 */
-    char * (*tcl_DStringAppendElement) _ANSI_ARGS_((Tcl_DString *dsPtr, CONST char *string)); /* 118 */
+    char * (*tcl_DStringAppend) _ANSI_ARGS_((Tcl_DString *dsPtr, CONST char *bytes, int length)); /* 117 */
+    char * (*tcl_DStringAppendElement) _ANSI_ARGS_((Tcl_DString *dsPtr, CONST char *element)); /* 118 */
     void (*tcl_DStringEndSublist) _ANSI_ARGS_((Tcl_DString *dsPtr)); /* 119 */
     void (*tcl_DStringFree) _ANSI_ARGS_((Tcl_DString *dsPtr)); /* 120 */
     void (*tcl_DStringGetResult) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_DString *dsPtr)); /* 121 */
@@ -1796,20 +1799,20 @@ typedef struct TclStubs {
     int (*tcl_Eof) _ANSI_ARGS_((Tcl_Channel chan)); /* 126 */
     CONST84_RETURN char * (*tcl_ErrnoId) _ANSI_ARGS_((void)); /* 127 */
     CONST84_RETURN char * (*tcl_ErrnoMsg) _ANSI_ARGS_((int err)); /* 128 */
-    int (*tcl_Eval) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string)); /* 129 */
+    int (*tcl_Eval) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *script)); /* 129 */
     int (*tcl_EvalFile) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *fileName)); /* 130 */
     int (*tcl_EvalObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr)); /* 131 */
     void (*tcl_EventuallyFree) _ANSI_ARGS_((ClientData clientData, Tcl_FreeProc *freeProc)); /* 132 */
     void (*tcl_Exit) _ANSI_ARGS_((int status)); /* 133 */
     int (*tcl_ExposeCommand) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *hiddenCmdToken, CONST char *cmdName)); /* 134 */
-    int (*tcl_ExprBoolean) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, int *ptr)); /* 135 */
+    int (*tcl_ExprBoolean) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *expr, int *ptr)); /* 135 */
     int (*tcl_ExprBooleanObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, int *ptr)); /* 136 */
-    int (*tcl_ExprDouble) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, double *ptr)); /* 137 */
+    int (*tcl_ExprDouble) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *expr, double *ptr)); /* 137 */
     int (*tcl_ExprDoubleObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, double *ptr)); /* 138 */
-    int (*tcl_ExprLong) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, long *ptr)); /* 139 */
+    int (*tcl_ExprLong) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *expr, long *ptr)); /* 139 */
     int (*tcl_ExprLongObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, long *ptr)); /* 140 */
     int (*tcl_ExprObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj **resultPtrPtr)); /* 141 */
-    int (*tcl_ExprString) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string)); /* 142 */
+    int (*tcl_ExprString) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *expr)); /* 142 */
     void (*tcl_Finalize) _ANSI_ARGS_((void)); /* 143 */
     void (*tcl_FindExecutable) _ANSI_ARGS_((CONST char *argv0)); /* 144 */
     Tcl_HashEntry * (*tcl_FirstHashEntry) _ANSI_ARGS_((Tcl_HashTable *tablePtr, Tcl_HashSearch *searchPtr)); /* 145 */
@@ -1835,7 +1838,7 @@ typedef struct TclStubs {
     CONST char * (*tcl_GetNameOfExecutable) _ANSI_ARGS_((void)); /* 165 */
     Tcl_Obj * (*tcl_GetObjResult) _ANSI_ARGS_((Tcl_Interp *interp)); /* 166 */
 #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    int (*tcl_GetOpenFile) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, int forWriting, int checkUsage, ClientData *filePtr)); /* 167 */
+    int (*tcl_GetOpenFile) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *chanID, int forWriting, int checkUsage, ClientData *filePtr)); /* 167 */
 #endif /* UNIX */
 #ifdef __WIN32__
     VOID *reserved167;
@@ -1861,13 +1864,13 @@ typedef struct TclStubs {
     int (*tcl_InputBuffered) _ANSI_ARGS_((Tcl_Channel chan)); /* 183 */
     int (*tcl_InterpDeleted) _ANSI_ARGS_((Tcl_Interp *interp)); /* 184 */
     int (*tcl_IsSafe) _ANSI_ARGS_((Tcl_Interp *interp)); /* 185 */
-    char * (*tcl_JoinPath) _ANSI_ARGS_((int argc, CONST84 char * CONST *argv, Tcl_DString *resultPtr)); /* 186 */
+    char * (*tcl_JoinPath) _ANSI_ARGS_((int argc, CONST84 char *CONST *argv, Tcl_DString *resultPtr)); /* 186 */
     int (*tcl_LinkVar) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *varName, char *addr, int type)); /* 187 */
     VOID *reserved188;
     Tcl_Channel (*tcl_MakeFileChannel) _ANSI_ARGS_((ClientData handle, int mode)); /* 189 */
     int (*tcl_MakeSafe) _ANSI_ARGS_((Tcl_Interp *interp)); /* 190 */
     Tcl_Channel (*tcl_MakeTcpClientChannel) _ANSI_ARGS_((ClientData tcpSocket)); /* 191 */
-    char * (*tcl_Merge) _ANSI_ARGS_((int argc, CONST84 char * CONST *argv)); /* 192 */
+    char * (*tcl_Merge) _ANSI_ARGS_((int argc, CONST84 char *CONST *argv)); /* 192 */
     Tcl_HashEntry * (*tcl_NextHashEntry) _ANSI_ARGS_((Tcl_HashSearch *searchPtr)); /* 193 */
     void (*tcl_NotifyChannel) _ANSI_ARGS_((Tcl_Channel channel, int mask)); /* 194 */
     Tcl_Obj * (*tcl_ObjGetVar2) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags)); /* 195 */
@@ -1886,7 +1889,7 @@ typedef struct TclStubs {
     Tcl_Channel (*tcl_OpenTcpServer) _ANSI_ARGS_((Tcl_Interp *interp, int port, CONST char *host, Tcl_TcpAcceptProc *acceptProc, ClientData callbackData)); /* 200 */
     void (*tcl_Preserve) _ANSI_ARGS_((ClientData data)); /* 201 */
     void (*tcl_PrintDouble) _ANSI_ARGS_((Tcl_Interp *interp, double value, char *dst)); /* 202 */
-    int (*tcl_PutEnv) _ANSI_ARGS_((CONST char *string)); /* 203 */
+    int (*tcl_PutEnv) _ANSI_ARGS_((CONST char *assignment)); /* 203 */
     CONST84_RETURN char * (*tcl_PosixError) _ANSI_ARGS_((Tcl_Interp *interp)); /* 204 */
     void (*tcl_QueueEvent) _ANSI_ARGS_((Tcl_Event *evPtr, Tcl_QueuePosition position)); /* 205 */
     int (*tcl_Read) _ANSI_ARGS_((Tcl_Channel chan, char *bufPtr, int toRead)); /* 206 */
@@ -1903,14 +1906,14 @@ typedef struct TclStubs {
     int (*tcl_RecordAndEvalObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *cmdPtr, int flags)); /* 209 */
     void (*tcl_RegisterChannel) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Channel chan)); /* 210 */
     void (*tcl_RegisterObjType) _ANSI_ARGS_((Tcl_ObjType *typePtr)); /* 211 */
-    Tcl_RegExp (*tcl_RegExpCompile) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string)); /* 212 */
-    int (*tcl_RegExpExec) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_RegExp regexp, CONST char *str, CONST char *start)); /* 213 */
-    int (*tcl_RegExpMatch) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, CONST char *pattern)); /* 214 */
+    Tcl_RegExp (*tcl_RegExpCompile) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *pattern)); /* 212 */
+    int (*tcl_RegExpExec) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_RegExp regexp, CONST char *text, CONST char *start)); /* 213 */
+    int (*tcl_RegExpMatch) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *text, CONST char *pattern)); /* 214 */
     void (*tcl_RegExpRange) _ANSI_ARGS_((Tcl_RegExp regexp, int index, CONST84 char **startPtr, CONST84 char **endPtr)); /* 215 */
     void (*tcl_Release) _ANSI_ARGS_((ClientData clientData)); /* 216 */
     void (*tcl_ResetResult) _ANSI_ARGS_((Tcl_Interp *interp)); /* 217 */
-    int (*tcl_ScanElement) _ANSI_ARGS_((CONST char *str, int *flagPtr)); /* 218 */
-    int (*tcl_ScanCountedElement) _ANSI_ARGS_((CONST char *str, int length, int *flagPtr)); /* 219 */
+    int (*tcl_ScanElement) _ANSI_ARGS_((CONST char *src, int *flagPtr)); /* 218 */
+    int (*tcl_ScanCountedElement) _ANSI_ARGS_((CONST char *src, int length, int *flagPtr)); /* 219 */
     int (*tcl_SeekOld) _ANSI_ARGS_((Tcl_Channel chan, int offset, int mode)); /* 220 */
     int (*tcl_ServiceAll) _ANSI_ARGS_((void)); /* 221 */
     int (*tcl_ServiceEvent) _ANSI_ARGS_((int flags)); /* 222 */
@@ -1923,7 +1926,7 @@ typedef struct TclStubs {
     void (*tcl_SetMaxBlockTime) _ANSI_ARGS_((Tcl_Time *timePtr)); /* 229 */
     void (*tcl_SetPanicProc) _ANSI_ARGS_((Tcl_PanicProc *panicProc)); /* 230 */
     int (*tcl_SetRecursionLimit) _ANSI_ARGS_((Tcl_Interp *interp, int depth)); /* 231 */
-    void (*tcl_SetResult) _ANSI_ARGS_((Tcl_Interp *interp, char *str, Tcl_FreeProc *freeProc)); /* 232 */
+    void (*tcl_SetResult) _ANSI_ARGS_((Tcl_Interp *interp, char *result, Tcl_FreeProc *freeProc)); /* 232 */
     int (*tcl_SetServiceMode) _ANSI_ARGS_((int mode)); /* 233 */
     void (*tcl_SetObjErrorCode) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *errorObjPtr)); /* 234 */
     void (*tcl_SetObjResult) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *resultObjPtr)); /* 235 */
@@ -1961,7 +1964,7 @@ typedef struct TclStubs {
     void (*tcl_AppendResultVA) _ANSI_ARGS_((Tcl_Interp *interp, va_list argList)); /* 267 */
     void (*tcl_AppendStringsToObjVA) _ANSI_ARGS_((Tcl_Obj *objPtr, va_list argList)); /* 268 */
     char * (*tcl_HashStats) _ANSI_ARGS_((Tcl_HashTable *tablePtr)); /* 269 */
-    CONST84_RETURN char * (*tcl_ParseVar) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, CONST84 char **termPtr)); /* 270 */
+    CONST84_RETURN char * (*tcl_ParseVar) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *start, CONST84 char **termPtr)); /* 270 */
     CONST84_RETURN char * (*tcl_PkgPresent) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, CONST char *version, int exact)); /* 271 */
     CONST84_RETURN char * (*tcl_PkgPresentEx) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, CONST char *version, int exact, ClientData *clientDataPtr)); /* 272 */
     int (*tcl_PkgProvide) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, CONST char *version)); /* 273 */
@@ -2003,21 +2006,21 @@ typedef struct TclStubs {
     void (*tcl_MutexUnlock) _ANSI_ARGS_((Tcl_Mutex *mutexPtr)); /* 309 */
     void (*tcl_ConditionNotify) _ANSI_ARGS_((Tcl_Condition *condPtr)); /* 310 */
     void (*tcl_ConditionWait) _ANSI_ARGS_((Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, Tcl_Time *timePtr)); /* 311 */
-    int (*tcl_NumUtfChars) _ANSI_ARGS_((CONST char *src, int len)); /* 312 */
+    int (*tcl_NumUtfChars) _ANSI_ARGS_((CONST char *src, int length)); /* 312 */
     int (*tcl_ReadChars) _ANSI_ARGS_((Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead, int appendFlag)); /* 313 */
     void (*tcl_RestoreResult) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_SavedResult *statePtr)); /* 314 */
     void (*tcl_SaveResult) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_SavedResult *statePtr)); /* 315 */
     int (*tcl_SetSystemEncoding) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name)); /* 316 */
     Tcl_Obj * (*tcl_SetVar2Ex) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *part1, CONST char *part2, Tcl_Obj *newValuePtr, int flags)); /* 317 */
     void (*tcl_ThreadAlert) _ANSI_ARGS_((Tcl_ThreadId threadId)); /* 318 */
-    void (*tcl_ThreadQueueEvent) _ANSI_ARGS_((Tcl_ThreadId threadId, Tcl_Event*evPtr, Tcl_QueuePosition position)); /* 319 */
+    void (*tcl_ThreadQueueEvent) _ANSI_ARGS_((Tcl_ThreadId threadId, Tcl_Event *evPtr, Tcl_QueuePosition position)); /* 319 */
     Tcl_UniChar (*tcl_UniCharAtIndex) _ANSI_ARGS_((CONST char *src, int index)); /* 320 */
     Tcl_UniChar (*tcl_UniCharToLower) _ANSI_ARGS_((int ch)); /* 321 */
     Tcl_UniChar (*tcl_UniCharToTitle) _ANSI_ARGS_((int ch)); /* 322 */
     Tcl_UniChar (*tcl_UniCharToUpper) _ANSI_ARGS_((int ch)); /* 323 */
     int (*tcl_UniCharToUtf) _ANSI_ARGS_((int ch, char *buf)); /* 324 */
     CONST84_RETURN char * (*tcl_UtfAtIndex) _ANSI_ARGS_((CONST char *src, int index)); /* 325 */
-    int (*tcl_UtfCharComplete) _ANSI_ARGS_((CONST char *src, int len)); /* 326 */
+    int (*tcl_UtfCharComplete) _ANSI_ARGS_((CONST char *src, int length)); /* 326 */
     int (*tcl_UtfBackslash) _ANSI_ARGS_((CONST char *src, int *readPtr, char *dst)); /* 327 */
     CONST84_RETURN char * (*tcl_UtfFindFirst) _ANSI_ARGS_((CONST char *src, int ch)); /* 328 */
     CONST84_RETURN char * (*tcl_UtfFindLast) _ANSI_ARGS_((CONST char *src, int ch)); /* 329 */
@@ -2043,19 +2046,19 @@ typedef struct TclStubs {
     int (*tcl_UniCharIsSpace) _ANSI_ARGS_((int ch)); /* 349 */
     int (*tcl_UniCharIsUpper) _ANSI_ARGS_((int ch)); /* 350 */
     int (*tcl_UniCharIsWordChar) _ANSI_ARGS_((int ch)); /* 351 */
-    int (*tcl_UniCharLen) _ANSI_ARGS_((CONST Tcl_UniChar *str)); /* 352 */
-    int (*tcl_UniCharNcmp) _ANSI_ARGS_((CONST Tcl_UniChar *cs, CONST Tcl_UniChar *ct, unsigned long n)); /* 353 */
-    char * (*tcl_UniCharToUtfDString) _ANSI_ARGS_((CONST Tcl_UniChar *string, int numChars, Tcl_DString *dsPtr)); /* 354 */
-    Tcl_UniChar * (*tcl_UtfToUniCharDString) _ANSI_ARGS_((CONST char *string, int length, Tcl_DString *dsPtr)); /* 355 */
+    int (*tcl_UniCharLen) _ANSI_ARGS_((CONST Tcl_UniChar *uniStr)); /* 352 */
+    int (*tcl_UniCharNcmp) _ANSI_ARGS_((CONST Tcl_UniChar *ucs, CONST Tcl_UniChar *uct, unsigned long numChars)); /* 353 */
+    char * (*tcl_UniCharToUtfDString) _ANSI_ARGS_((CONST Tcl_UniChar *uniStr, int uniLength, Tcl_DString *dsPtr)); /* 354 */
+    Tcl_UniChar * (*tcl_UtfToUniCharDString) _ANSI_ARGS_((CONST char *src, int length, Tcl_DString *dsPtr)); /* 355 */
     Tcl_RegExp (*tcl_GetRegExpFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *patObj, int flags)); /* 356 */
     Tcl_Obj * (*tcl_EvalTokens) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Token *tokenPtr, int count)); /* 357 */
     void (*tcl_FreeParse) _ANSI_ARGS_((Tcl_Parse *parsePtr)); /* 358 */
     void (*tcl_LogCommandInfo) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *script, CONST char *command, int length)); /* 359 */
-    int (*tcl_ParseBraces) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr)); /* 360 */
-    int (*tcl_ParseCommand) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string, int numBytes, int nested, Tcl_Parse *parsePtr)); /* 361 */
-    int (*tcl_ParseExpr) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string, int numBytes, Tcl_Parse *parsePtr)); /* 362 */
-    int (*tcl_ParseQuotedString) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr)); /* 363 */
-    int (*tcl_ParseVarName) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string, int numBytes, Tcl_Parse *parsePtr, int append)); /* 364 */
+    int (*tcl_ParseBraces) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *start, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr)); /* 360 */
+    int (*tcl_ParseCommand) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *start, int numBytes, int nested, Tcl_Parse *parsePtr)); /* 361 */
+    int (*tcl_ParseExpr) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *start, int numBytes, Tcl_Parse *parsePtr)); /* 362 */
+    int (*tcl_ParseQuotedString) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *start, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr)); /* 363 */
+    int (*tcl_ParseVarName) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *start, int numBytes, Tcl_Parse *parsePtr, int append)); /* 364 */
     char * (*tcl_GetCwd) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_DString *cwdPtr)); /* 365 */
     int (*tcl_Chdir) _ANSI_ARGS_((CONST char *dirName)); /* 366 */
     int (*tcl_Access) _ANSI_ARGS_((CONST char *path, int mode)); /* 367 */
@@ -2067,7 +2070,7 @@ typedef struct TclStubs {
     int (*tcl_UniCharIsGraph) _ANSI_ARGS_((int ch)); /* 373 */
     int (*tcl_UniCharIsPrint) _ANSI_ARGS_((int ch)); /* 374 */
     int (*tcl_UniCharIsPunct) _ANSI_ARGS_((int ch)); /* 375 */
-    int (*tcl_RegExpExecObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *objPtr, int offset, int nmatches, int flags)); /* 376 */
+    int (*tcl_RegExpExecObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, int offset, int nmatches, int flags)); /* 376 */
     void (*tcl_RegExpGetInfo) _ANSI_ARGS_((Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr)); /* 377 */
     Tcl_Obj * (*tcl_NewUnicodeObj) _ANSI_ARGS_((CONST Tcl_UniChar *unicode, int numChars)); /* 378 */
     void (*tcl_SetUnicodeObj) _ANSI_ARGS_((Tcl_Obj *objPtr, CONST Tcl_UniChar *unicode, int numChars)); /* 379 */
@@ -2076,7 +2079,7 @@ typedef struct TclStubs {
     Tcl_UniChar * (*tcl_GetUnicode) _ANSI_ARGS_((Tcl_Obj *objPtr)); /* 382 */
     Tcl_Obj * (*tcl_GetRange) _ANSI_ARGS_((Tcl_Obj *objPtr, int first, int last)); /* 383 */
     void (*tcl_AppendUnicodeToObj) _ANSI_ARGS_((Tcl_Obj *objPtr, CONST Tcl_UniChar *unicode, int length)); /* 384 */
-    int (*tcl_RegExpMatchObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *stringObj, Tcl_Obj *patternObj)); /* 385 */
+    int (*tcl_RegExpMatchObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *textObj, Tcl_Obj *patternObj)); /* 385 */
     void (*tcl_SetNotifier) _ANSI_ARGS_((Tcl_NotifierProcs *notifierProcPtr)); /* 386 */
     Tcl_Mutex * (*tcl_GetAllocMutex) _ANSI_ARGS_((void)); /* 387 */
     int (*tcl_GetChannelNames) _ANSI_ARGS_((Tcl_Interp *interp)); /* 388 */
@@ -2103,15 +2106,15 @@ typedef struct TclStubs {
     Tcl_DriverGetHandleProc * (*tcl_ChannelGetHandleProc) _ANSI_ARGS_((Tcl_ChannelType *chanTypePtr)); /* 409 */
     Tcl_DriverFlushProc * (*tcl_ChannelFlushProc) _ANSI_ARGS_((Tcl_ChannelType *chanTypePtr)); /* 410 */
     Tcl_DriverHandlerProc * (*tcl_ChannelHandlerProc) _ANSI_ARGS_((Tcl_ChannelType *chanTypePtr)); /* 411 */
-    int (*tcl_JoinThread) _ANSI_ARGS_((Tcl_ThreadId threadId, int*result)); /* 412 */
+    int (*tcl_JoinThread) _ANSI_ARGS_((Tcl_ThreadId threadId, int *result)); /* 412 */
     int (*tcl_IsChannelShared) _ANSI_ARGS_((Tcl_Channel channel)); /* 413 */
-    int (*tcl_IsChannelRegistered) _ANSI_ARGS_((Tcl_Interp*interp, Tcl_Channel channel)); /* 414 */
+    int (*tcl_IsChannelRegistered) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Channel channel)); /* 414 */
     void (*tcl_CutChannel) _ANSI_ARGS_((Tcl_Channel channel)); /* 415 */
     void (*tcl_SpliceChannel) _ANSI_ARGS_((Tcl_Channel channel)); /* 416 */
     void (*tcl_ClearChannelHandlers) _ANSI_ARGS_((Tcl_Channel channel)); /* 417 */
-    int (*tcl_IsChannelExisting) _ANSI_ARGS_((CONST char*channelName)); /* 418 */
-    int (*tcl_UniCharNcasecmp) _ANSI_ARGS_((CONST Tcl_UniChar *cs, CONST Tcl_UniChar *ct, unsigned long n)); /* 419 */
-    int (*tcl_UniCharCaseMatch) _ANSI_ARGS_((CONST Tcl_UniChar *ustr, CONST Tcl_UniChar *pattern, int nocase)); /* 420 */
+    int (*tcl_IsChannelExisting) _ANSI_ARGS_((CONST char *channelName)); /* 418 */
+    int (*tcl_UniCharNcasecmp) _ANSI_ARGS_((CONST Tcl_UniChar *ucs, CONST Tcl_UniChar *uct, unsigned long numChars)); /* 419 */
+    int (*tcl_UniCharCaseMatch) _ANSI_ARGS_((CONST Tcl_UniChar *uniStr, CONST Tcl_UniChar *uniPattern, int nocase)); /* 420 */
     Tcl_HashEntry * (*tcl_FindHashEntry) _ANSI_ARGS_((Tcl_HashTable *tablePtr, CONST char *key)); /* 421 */
     Tcl_HashEntry * (*tcl_CreateHashEntry) _ANSI_ARGS_((Tcl_HashTable *tablePtr, CONST char *key, int *newPtr)); /* 422 */
     void (*tcl_InitCustomHashTable) _ANSI_ARGS_((Tcl_HashTable *tablePtr, int keyType, Tcl_HashKeyType *typePtr)); /* 423 */
@@ -2129,7 +2132,7 @@ typedef struct TclStubs {
     int (*tcl_GetMathFuncInfo) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, int *numArgsPtr, Tcl_ValueType **argTypesPtr, Tcl_MathProc **procPtr, ClientData *clientDataPtr)); /* 435 */
     Tcl_Obj * (*tcl_ListMathFuncs) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *pattern)); /* 436 */
     Tcl_Obj * (*tcl_SubstObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, int flags)); /* 437 */
-    int (*tcl_DetachChannel) _ANSI_ARGS_((Tcl_Interp*interp, Tcl_Channel channel)); /* 438 */
+    int (*tcl_DetachChannel) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Channel channel)); /* 438 */
     int (*tcl_IsStandardChannel) _ANSI_ARGS_((Tcl_Channel channel)); /* 439 */
     int (*tcl_FSCopyFile) _ANSI_ARGS_((Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr)); /* 440 */
     int (*tcl_FSCopyDirectory) _ANSI_ARGS_((Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr)); /* 441 */
@@ -2148,35 +2151,35 @@ typedef struct TclStubs {
     int (*tcl_FSStat) _ANSI_ARGS_((Tcl_Obj *pathPtr, Tcl_StatBuf *buf)); /* 454 */
     int (*tcl_FSAccess) _ANSI_ARGS_((Tcl_Obj *pathPtr, int mode)); /* 455 */
     Tcl_Channel (*tcl_FSOpenFileChannel) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *pathPtr, CONST char *modeString, int permissions)); /* 456 */
-    Tcl_Obj* (*tcl_FSGetCwd) _ANSI_ARGS_((Tcl_Interp *interp)); /* 457 */
+    Tcl_Obj * (*tcl_FSGetCwd) _ANSI_ARGS_((Tcl_Interp *interp)); /* 457 */
     int (*tcl_FSChdir) _ANSI_ARGS_((Tcl_Obj *pathPtr)); /* 458 */
     int (*tcl_FSConvertToPathType) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *pathPtr)); /* 459 */
-    Tcl_Obj* (*tcl_FSJoinPath) _ANSI_ARGS_((Tcl_Obj *listObj, int elements)); /* 460 */
-    Tcl_Obj* (*tcl_FSSplitPath) _ANSI_ARGS_((Tcl_Obj*pathPtr, int *lenPtr)); /* 461 */
-    int (*tcl_FSEqualPaths) _ANSI_ARGS_((Tcl_Obj*firstPtr, Tcl_Obj*secondPtr)); /* 462 */
-    Tcl_Obj* (*tcl_FSGetNormalizedPath) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj*pathObjPtr)); /* 463 */
-    Tcl_Obj* (*tcl_FSJoinToPath) _ANSI_ARGS_((Tcl_Obj *basePtr, int objc, Tcl_Obj *CONST objv[])); /* 464 */
-    ClientData (*tcl_FSGetInternalRep) _ANSI_ARGS_((Tcl_Obj*pathObjPtr, Tcl_Filesystem *fsPtr)); /* 465 */
-    Tcl_Obj* (*tcl_FSGetTranslatedPath) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj*pathPtr)); /* 466 */
+    Tcl_Obj * (*tcl_FSJoinPath) _ANSI_ARGS_((Tcl_Obj *listObj, int elements)); /* 460 */
+    Tcl_Obj * (*tcl_FSSplitPath) _ANSI_ARGS_((Tcl_Obj *pathPtr, int *lenPtr)); /* 461 */
+    int (*tcl_FSEqualPaths) _ANSI_ARGS_((Tcl_Obj *firstPtr, Tcl_Obj *secondPtr)); /* 462 */
+    Tcl_Obj * (*tcl_FSGetNormalizedPath) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *pathPtr)); /* 463 */
+    Tcl_Obj * (*tcl_FSJoinToPath) _ANSI_ARGS_((Tcl_Obj *pathPtr, int objc, Tcl_Obj *CONST objv[])); /* 464 */
+    ClientData (*tcl_FSGetInternalRep) _ANSI_ARGS_((Tcl_Obj *pathPtr, Tcl_Filesystem *fsPtr)); /* 465 */
+    Tcl_Obj * (*tcl_FSGetTranslatedPath) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *pathPtr)); /* 466 */
     int (*tcl_FSEvalFile) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *fileName)); /* 467 */
-    Tcl_Obj* (*tcl_FSNewNativePath) _ANSI_ARGS_((Tcl_Filesystem*fromFilesystem, ClientData clientData)); /* 468 */
-    CONST char* (*tcl_FSGetNativePath) _ANSI_ARGS_((Tcl_Obj*pathObjPtr)); /* 469 */
-    Tcl_Obj* (*tcl_FSFileSystemInfo) _ANSI_ARGS_((Tcl_Obj*pathObjPtr)); /* 470 */
-    Tcl_Obj* (*tcl_FSPathSeparator) _ANSI_ARGS_((Tcl_Obj*pathObjPtr)); /* 471 */
-    Tcl_Obj* (*tcl_FSListVolumes) _ANSI_ARGS_((void)); /* 472 */
+    Tcl_Obj * (*tcl_FSNewNativePath) _ANSI_ARGS_((Tcl_Filesystem *fromFilesystem, ClientData clientData)); /* 468 */
+    CONST char * (*tcl_FSGetNativePath) _ANSI_ARGS_((Tcl_Obj *pathPtr)); /* 469 */
+    Tcl_Obj * (*tcl_FSFileSystemInfo) _ANSI_ARGS_((Tcl_Obj *pathPtr)); /* 470 */
+    Tcl_Obj * (*tcl_FSPathSeparator) _ANSI_ARGS_((Tcl_Obj *pathPtr)); /* 471 */
+    Tcl_Obj * (*tcl_FSListVolumes) _ANSI_ARGS_((void)); /* 472 */
     int (*tcl_FSRegister) _ANSI_ARGS_((ClientData clientData, Tcl_Filesystem *fsPtr)); /* 473 */
     int (*tcl_FSUnregister) _ANSI_ARGS_((Tcl_Filesystem *fsPtr)); /* 474 */
     ClientData (*tcl_FSData) _ANSI_ARGS_((Tcl_Filesystem *fsPtr)); /* 475 */
-    CONST char* (*tcl_FSGetTranslatedStringPath) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj*pathPtr)); /* 476 */
-    Tcl_Filesystem* (*tcl_FSGetFileSystemForPath) _ANSI_ARGS_((Tcl_Obj*pathObjPtr)); /* 477 */
-    Tcl_PathType (*tcl_FSGetPathType) _ANSI_ARGS_((Tcl_Obj *pathObjPtr)); /* 478 */
+    CONST char * (*tcl_FSGetTranslatedStringPath) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *pathPtr)); /* 476 */
+    Tcl_Filesystem * (*tcl_FSGetFileSystemForPath) _ANSI_ARGS_((Tcl_Obj *pathPtr)); /* 477 */
+    Tcl_PathType (*tcl_FSGetPathType) _ANSI_ARGS_((Tcl_Obj *pathPtr)); /* 478 */
     int (*tcl_OutputBuffered) _ANSI_ARGS_((Tcl_Channel chan)); /* 479 */
     void (*tcl_FSMountsChanged) _ANSI_ARGS_((Tcl_Filesystem *fsPtr)); /* 480 */
     int (*tcl_EvalTokensStandard) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Token *tokenPtr, int count)); /* 481 */
-    void (*tcl_GetTime) _ANSI_ARGS_((Tcl_Time*timeBuf)); /* 482 */
-    Tcl_Trace (*tcl_CreateObjTrace) _ANSI_ARGS_((Tcl_Interp*interp, int level, int flags, Tcl_CmdObjTraceProc*objProc, ClientData clientData, Tcl_CmdObjTraceDeleteProc*delProc)); /* 483 */
-    int (*tcl_GetCommandInfoFromToken) _ANSI_ARGS_((Tcl_Command token, Tcl_CmdInfo*infoPtr)); /* 484 */
-    int (*tcl_SetCommandInfoFromToken) _ANSI_ARGS_((Tcl_Command token, CONST Tcl_CmdInfo*infoPtr)); /* 485 */
+    void (*tcl_GetTime) _ANSI_ARGS_((Tcl_Time *timeBuf)); /* 482 */
+    Tcl_Trace (*tcl_CreateObjTrace) _ANSI_ARGS_((Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc *objProc, ClientData clientData, Tcl_CmdObjTraceDeleteProc *delProc)); /* 483 */
+    int (*tcl_GetCommandInfoFromToken) _ANSI_ARGS_((Tcl_Command token, Tcl_CmdInfo *infoPtr)); /* 484 */
+    int (*tcl_SetCommandInfoFromToken) _ANSI_ARGS_((Tcl_Command token, CONST Tcl_CmdInfo *infoPtr)); /* 485 */
     Tcl_Obj * (*tcl_DbNewWideIntObj) _ANSI_ARGS_((Tcl_WideInt wideValue, CONST char *file, int line)); /* 486 */
     int (*tcl_GetWideIntFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideInt *widePtr)); /* 487 */
     Tcl_Obj * (*tcl_NewWideIntObj) _ANSI_ARGS_((Tcl_WideInt wideValue)); /* 488 */