- genStubs.tcl: No longer generate a space after "*" and

  immediately after a function name, so the
  format of function definitions in tcl*Decls.h
  matches all other tcl*.h header files.
- Change Tcl_ArgvFuncProc, Tcl_ArgvGenFuncProc
  and GetFrameInfoValueProc to be function
  definitions, not pointers, for consistency
  with all other Tcl function definitions.

19 files changed, 1727 insertions, 1775 deletions

diff --git a/ChangeLog b/ChangeLog
index a0eab4e..dea995b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-01-29  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* tools/genStubs.tcl:   No longer generate a space after "*" and
+	                        immediately after a function name, so the
+	                        format of function definitions in tcl*Decls.h 
+	                        match all other tcl*.h header files.
+	* doc/ParseArgs.3:      Change Tcl_ArgvFuncProc, Tcl_ArgvGenFuncProc
+	* generic/tcl.h         and GetFrameInfoValueProc to be function
+	* generic/tclInt.h      definitions, not pointers, for consistency
+	* generic/tclOOInt.h    with all other Tcl function definitions.
+	* generic/tclIndexObj.c
+	* generic/regguts.h:    CONST -> const
+	* generic/tcl.decls     Formatting
+	* generic/tclTomMath.decls Formatting
+	* generic/tclDecls.h    (regenerated)
+	* generic/tclIntDecls.h
+	* generic/tclIntPlatDecls.h
+	* generic/tclOODecls.h
+	* generic/tclOOIntDecls.h
+	* generic/tclPlatDecls.h
+	* generic/tclTomMathDecls.h
+
 2010-01-28  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tclOOBasic.c (TclOO_Object_Destroy): Move the execution of
diff --git a/doc/ParseArgs.3 b/doc/ParseArgs.3
index 524e2f2..1711b8c 100644
--- a/doc/ParseArgs.3
+++ b/doc/ParseArgs.3
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ParseArgs.3,v 1.1 2008/10/02 23:32:13 dkf Exp $
+'\" RCS: @(#) $Id: ParseArgs.3,v 1.2 2010/01/29 16:17:21 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tcl_ParseArgsObjv 3 8.6 Tcl "Tcl Library Procedures"
@@ -128,7 +128,7 @@ have the following signature:
 .RS
 .PP
 .CS
-typedef int (*\fBTcl_ArgvFuncProc\fR)(
+typedef int (\fBTcl_ArgvFuncProc\fR)(
         ClientData \fIclientData\fR,
         Tcl_Obj *\fIobjPtr\fR,
         void *\fIdstPtr\fR);
@@ -150,7 +150,7 @@ function will have the following signature:
 .RS
 .PP
 .CS
-typedef int (*\fBTcl_ArgvGenFuncProc\fR)(
+typedef int (\fBTcl_ArgvGenFuncProc\fR)(
         ClientData \fIclientData\fR,
         Tcl_Interp *\fIinterp\fR,
         int \fIobjc\fR,
diff --git a/generic/regguts.h b/generic/regguts.h
index 67e3d03..f72542c 100644
--- a/generic/regguts.h
+++ b/generic/regguts.h
@@ -75,11 +75,6 @@
 #define	NOPARMS	void		/* for empty parm lists */
 #endif
 
-/* const */
-#ifndef CONST
-#define	CONST	const		/* for old compilers, might be empty */
-#endif
-
 /* function-pointer declarator */
 #ifndef FUNCPTR
 #if __STDC__ >= 1
@@ -400,7 +395,7 @@ struct guts {
     struct cnfa search;		/* for fast preliminary search */
     int ntree;
     struct colormap cmap;
-    int FUNCPTR(compare, (CONST chr *, CONST chr *, size_t));
+    int FUNCPTR(compare, (const chr *, const chr *, size_t));
     struct subre *lacons;	/* lookahead-constraint vector */
     int nlacons;		/* size of lacons */
 };
diff --git a/generic/tcl.decls b/generic/tcl.decls
index b0644ae..e9843a8 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.171 2009/09/24 17:19:17 dgp Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.172 2010/01/29 16:17:20 nijtmans Exp $
 
 library tcl
 
@@ -2124,7 +2124,7 @@ declare 581 generic {
 
 # TIP#304 (chan pipe) aferrieux
 declare 582 generic {
-    int Tcl_CreatePipe (Tcl_Interp  *interp, Tcl_Channel *rchan,
+    int Tcl_CreatePipe(Tcl_Interp  *interp, Tcl_Channel *rchan,
 	    Tcl_Channel *wchan, int flags)
 }
 
diff --git a/generic/tcl.h b/generic/tcl.h
index 201a3a1..21e97cc 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.298 2010/01/22 13:05:17 nijtmans Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.299 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #ifndef _TCL
@@ -2231,9 +2231,9 @@ typedef struct {
  * argument types:
  */
 
-typedef int (*Tcl_ArgvFuncProc)(ClientData clientData, Tcl_Obj *objPtr,
+typedef int (Tcl_ArgvFuncProc)(ClientData clientData, Tcl_Obj *objPtr,
 	void *dstPtr);
-typedef int (*Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp,
+typedef int (Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp,
 	int objc, Tcl_Obj *const *objv, void *dstPtr);
 
 /*
@@ -2342,7 +2342,6 @@ EXTERN const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
 EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
 #endif
 
-
 /*
  * Single public declaration for NRE.
  */
@@ -2529,7 +2528,6 @@ typedef int (Tcl_NRPostProc) (ClientData data[], Tcl_Interp *interp,
 #   define panicVA		Tcl_PanicVA
 #endif
 
-
 /*
  * Convenience declaration of Tcl_AppInit for backwards compatibility. This
  * function is not *implemented* by the tcl library, so the storage class is
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 23061a6..e5fabd1 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.172 2009/09/24 17:19:18 dgp Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.173 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #ifndef _TCLDECLS
@@ -40,2314 +40,2285 @@
 #ifndef Tcl_PkgProvideEx_TCL_DECLARED
 #define Tcl_PkgProvideEx_TCL_DECLARED
 /* 0 */
-EXTERN int		Tcl_PkgProvideEx (Tcl_Interp * interp,
-				const char * name, const char * version,
+EXTERN int		Tcl_PkgProvideEx(Tcl_Interp *interp,
+				const char *name, const char *version,
 				ClientData clientData);
 #endif
 #ifndef Tcl_PkgRequireEx_TCL_DECLARED
 #define Tcl_PkgRequireEx_TCL_DECLARED
 /* 1 */
-EXTERN CONST84_RETURN char * Tcl_PkgRequireEx (Tcl_Interp * interp,
-				const char * name, const char * version,
-				int exact, ClientData * clientDataPtr);
+EXTERN CONST84_RETURN char * Tcl_PkgRequireEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact, ClientData *clientDataPtr);
 #endif
 #ifndef Tcl_Panic_TCL_DECLARED
 #define Tcl_Panic_TCL_DECLARED
 /* 2 */
-EXTERN void		Tcl_Panic (const char * format, ...);
+EXTERN void		Tcl_Panic(const char *format, ...);
 #endif
 #ifndef Tcl_Alloc_TCL_DECLARED
 #define Tcl_Alloc_TCL_DECLARED
 /* 3 */
-EXTERN char *		Tcl_Alloc (unsigned int size);
+EXTERN char *		Tcl_Alloc(unsigned int size);
 #endif
 #ifndef Tcl_Free_TCL_DECLARED
 #define Tcl_Free_TCL_DECLARED
 /* 4 */
-EXTERN void		Tcl_Free (char * ptr);
+EXTERN void		Tcl_Free(char *ptr);
 #endif
 #ifndef Tcl_Realloc_TCL_DECLARED
 #define Tcl_Realloc_TCL_DECLARED
 /* 5 */
-EXTERN char *		Tcl_Realloc (char * ptr, unsigned int size);
+EXTERN char *		Tcl_Realloc(char *ptr, unsigned int size);
 #endif
 #ifndef Tcl_DbCkalloc_TCL_DECLARED
 #define Tcl_DbCkalloc_TCL_DECLARED
 /* 6 */
-EXTERN char *		Tcl_DbCkalloc (unsigned int size, const char * file,
+EXTERN char *		Tcl_DbCkalloc(unsigned int size, const char *file,
 				int line);
 #endif
 #ifndef Tcl_DbCkfree_TCL_DECLARED
 #define Tcl_DbCkfree_TCL_DECLARED
 /* 7 */
-EXTERN void		Tcl_DbCkfree (char * ptr, const char * file,
-				int line);
+EXTERN void		Tcl_DbCkfree(char *ptr, const char *file, int line);
 #endif
 #ifndef Tcl_DbCkrealloc_TCL_DECLARED
 #define Tcl_DbCkrealloc_TCL_DECLARED
 /* 8 */
-EXTERN char *		Tcl_DbCkrealloc (char * ptr, unsigned int size,
-				const char * file, int line);
+EXTERN char *		Tcl_DbCkrealloc(char *ptr, unsigned int size,
+				const char *file, int line);
 #endif
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
 #ifndef Tcl_CreateFileHandler_TCL_DECLARED
 #define Tcl_CreateFileHandler_TCL_DECLARED
 /* 9 */
-EXTERN void		Tcl_CreateFileHandler (int fd, int mask,
-				Tcl_FileProc * proc, ClientData clientData);
+EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
+				Tcl_FileProc *proc, ClientData clientData);
 #endif
 #endif /* UNIX */
 #ifdef MAC_OSX_TCL /* MACOSX */
 #ifndef Tcl_CreateFileHandler_TCL_DECLARED
 #define Tcl_CreateFileHandler_TCL_DECLARED
 /* 9 */
-EXTERN void		Tcl_CreateFileHandler (int fd, int mask,
-				Tcl_FileProc * proc, ClientData clientData);
+EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
+				Tcl_FileProc *proc, ClientData clientData);
 #endif
 #endif /* MACOSX */
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
 #ifndef Tcl_DeleteFileHandler_TCL_DECLARED
 #define Tcl_DeleteFileHandler_TCL_DECLARED
 /* 10 */
-EXTERN void		Tcl_DeleteFileHandler (int fd);
+EXTERN void		Tcl_DeleteFileHandler(int fd);
 #endif
 #endif /* UNIX */
 #ifdef MAC_OSX_TCL /* MACOSX */
 #ifndef Tcl_DeleteFileHandler_TCL_DECLARED
 #define Tcl_DeleteFileHandler_TCL_DECLARED
 /* 10 */
-EXTERN void		Tcl_DeleteFileHandler (int fd);
+EXTERN void		Tcl_DeleteFileHandler(int fd);
 #endif
 #endif /* MACOSX */
 #ifndef Tcl_SetTimer_TCL_DECLARED
 #define Tcl_SetTimer_TCL_DECLARED
 /* 11 */
-EXTERN void		Tcl_SetTimer (const Tcl_Time * timePtr);
+EXTERN void		Tcl_SetTimer(const Tcl_Time *timePtr);
 #endif
 #ifndef Tcl_Sleep_TCL_DECLARED
 #define Tcl_Sleep_TCL_DECLARED
 /* 12 */
-EXTERN void		Tcl_Sleep (int ms);
+EXTERN void		Tcl_Sleep(int ms);
 #endif
 #ifndef Tcl_WaitForEvent_TCL_DECLARED
 #define Tcl_WaitForEvent_TCL_DECLARED
 /* 13 */
-EXTERN int		Tcl_WaitForEvent (const Tcl_Time * timePtr);
+EXTERN int		Tcl_WaitForEvent(const Tcl_Time *timePtr);
 #endif
 #ifndef Tcl_AppendAllObjTypes_TCL_DECLARED
 #define Tcl_AppendAllObjTypes_TCL_DECLARED
 /* 14 */
-EXTERN int		Tcl_AppendAllObjTypes (Tcl_Interp * interp,
-				Tcl_Obj * objPtr);
+EXTERN int		Tcl_AppendAllObjTypes(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_AppendStringsToObj_TCL_DECLARED
 #define Tcl_AppendStringsToObj_TCL_DECLARED
 /* 15 */
-EXTERN void		Tcl_AppendStringsToObj (Tcl_Obj * objPtr, ...);
+EXTERN void		Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...);
 #endif
 #ifndef Tcl_AppendToObj_TCL_DECLARED
 #define Tcl_AppendToObj_TCL_DECLARED
 /* 16 */
-EXTERN void		Tcl_AppendToObj (Tcl_Obj * objPtr,
-				const char * bytes, int length);
+EXTERN void		Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes,
+				int length);
 #endif
 #ifndef Tcl_ConcatObj_TCL_DECLARED
 #define Tcl_ConcatObj_TCL_DECLARED
 /* 17 */
-EXTERN Tcl_Obj *	Tcl_ConcatObj (int objc, Tcl_Obj *const objv[]);
+EXTERN Tcl_Obj *	Tcl_ConcatObj(int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_ConvertToType_TCL_DECLARED
 #define Tcl_ConvertToType_TCL_DECLARED
 /* 18 */
-EXTERN int		Tcl_ConvertToType (Tcl_Interp * interp,
-				Tcl_Obj * objPtr,
-				const Tcl_ObjType * typePtr);
+EXTERN int		Tcl_ConvertToType(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const Tcl_ObjType *typePtr);
 #endif
 #ifndef Tcl_DbDecrRefCount_TCL_DECLARED
 #define Tcl_DbDecrRefCount_TCL_DECLARED
 /* 19 */
-EXTERN void		Tcl_DbDecrRefCount (Tcl_Obj * objPtr,
-				const char * file, int line);
+EXTERN void		Tcl_DbDecrRefCount(Tcl_Obj *objPtr, const char *file,
+				int line);
 #endif
 #ifndef Tcl_DbIncrRefCount_TCL_DECLARED
 #define Tcl_DbIncrRefCount_TCL_DECLARED
 /* 20 */
-EXTERN void		Tcl_DbIncrRefCount (Tcl_Obj * objPtr,
-				const char * file, int line);
+EXTERN void		Tcl_DbIncrRefCount(Tcl_Obj *objPtr, const char *file,
+				int line);
 #endif
 #ifndef Tcl_DbIsShared_TCL_DECLARED
 #define Tcl_DbIsShared_TCL_DECLARED
 /* 21 */
-EXTERN int		Tcl_DbIsShared (Tcl_Obj * objPtr, const char * file,
+EXTERN int		Tcl_DbIsShared(Tcl_Obj *objPtr, const char *file,
 				int line);
 #endif
 #ifndef Tcl_DbNewBooleanObj_TCL_DECLARED
 #define Tcl_DbNewBooleanObj_TCL_DECLARED
 /* 22 */
-EXTERN Tcl_Obj *	Tcl_DbNewBooleanObj (int boolValue,
-				const char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewBooleanObj(int boolValue, const char *file,
+				int line);
 #endif
 #ifndef Tcl_DbNewByteArrayObj_TCL_DECLARED
 #define Tcl_DbNewByteArrayObj_TCL_DECLARED
 /* 23 */
-EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj (const unsigned char * bytes,
-				int length, const char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj(const unsigned char *bytes,
+				int length, const char *file, int line);
 #endif
 #ifndef Tcl_DbNewDoubleObj_TCL_DECLARED
 #define Tcl_DbNewDoubleObj_TCL_DECLARED
 /* 24 */
-EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj (double doubleValue,
-				const char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj(double doubleValue,
+				const char *file, int line);
 #endif
 #ifndef Tcl_DbNewListObj_TCL_DECLARED
 #define Tcl_DbNewListObj_TCL_DECLARED
 /* 25 */
-EXTERN Tcl_Obj *	Tcl_DbNewListObj (int objc, Tcl_Obj *const * objv,
-				const char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewListObj(int objc, Tcl_Obj *const *objv,
+				const char *file, int line);
 #endif
 #ifndef Tcl_DbNewLongObj_TCL_DECLARED
 #define Tcl_DbNewLongObj_TCL_DECLARED
 /* 26 */
-EXTERN Tcl_Obj *	Tcl_DbNewLongObj (long longValue, const char * file,
+EXTERN Tcl_Obj *	Tcl_DbNewLongObj(long longValue, const char *file,
 				int line);
 #endif
 #ifndef Tcl_DbNewObj_TCL_DECLARED
 #define Tcl_DbNewObj_TCL_DECLARED
 /* 27 */
-EXTERN Tcl_Obj *	Tcl_DbNewObj (const char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewObj(const char *file, int line);
 #endif
 #ifndef Tcl_DbNewStringObj_TCL_DECLARED
 #define Tcl_DbNewStringObj_TCL_DECLARED
 /* 28 */
-EXTERN Tcl_Obj *	Tcl_DbNewStringObj (const char * bytes, int length,
-				const char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes, int length,
+				const char *file, int line);
 #endif
 #ifndef Tcl_DuplicateObj_TCL_DECLARED
 #define Tcl_DuplicateObj_TCL_DECLARED
 /* 29 */
-EXTERN Tcl_Obj *	Tcl_DuplicateObj (Tcl_Obj * objPtr);
+EXTERN Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
 #endif
 #ifndef TclFreeObj_TCL_DECLARED
 #define TclFreeObj_TCL_DECLARED
 /* 30 */
-EXTERN void		TclFreeObj (Tcl_Obj * objPtr);
+EXTERN void		TclFreeObj(Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetBoolean_TCL_DECLARED
 #define Tcl_GetBoolean_TCL_DECLARED
 /* 31 */
-EXTERN int		Tcl_GetBoolean (Tcl_Interp * interp,
-				const char * src, int * boolPtr);
+EXTERN int		Tcl_GetBoolean(Tcl_Interp *interp, const char *src,
+				int *boolPtr);
 #endif
 #ifndef Tcl_GetBooleanFromObj_TCL_DECLARED
 #define Tcl_GetBooleanFromObj_TCL_DECLARED
 /* 32 */
-EXTERN int		Tcl_GetBooleanFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, int * boolPtr);
+EXTERN int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *boolPtr);
 #endif
 #ifndef Tcl_GetByteArrayFromObj_TCL_DECLARED
 #define Tcl_GetByteArrayFromObj_TCL_DECLARED
 /* 33 */
-EXTERN unsigned char *	Tcl_GetByteArrayFromObj (Tcl_Obj * objPtr,
-				int * lengthPtr);
+EXTERN unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
+				int *lengthPtr);
 #endif
 #ifndef Tcl_GetDouble_TCL_DECLARED
 #define Tcl_GetDouble_TCL_DECLARED
 /* 34 */
-EXTERN int		Tcl_GetDouble (Tcl_Interp * interp, const char * src,
-				double * doublePtr);
+EXTERN int		Tcl_GetDouble(Tcl_Interp *interp, const char *src,
+				double *doublePtr);
 #endif
 #ifndef Tcl_GetDoubleFromObj_TCL_DECLARED
 #define Tcl_GetDoubleFromObj_TCL_DECLARED
 /* 35 */
-EXTERN int		Tcl_GetDoubleFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, double * doublePtr);
+EXTERN int		Tcl_GetDoubleFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, double *doublePtr);
 #endif
 #ifndef Tcl_GetIndexFromObj_TCL_DECLARED
 #define Tcl_GetIndexFromObj_TCL_DECLARED
 /* 36 */
-EXTERN int		Tcl_GetIndexFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr,
-				CONST84 char *const * tablePtr,
-				const char * msg, int flags, int * indexPtr);
+EXTERN int		Tcl_GetIndexFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr,
+				CONST84 char *const *tablePtr,
+				const char *msg, int flags, int *indexPtr);
 #endif
 #ifndef Tcl_GetInt_TCL_DECLARED
 #define Tcl_GetInt_TCL_DECLARED
 /* 37 */
-EXTERN int		Tcl_GetInt (Tcl_Interp * interp, const char * src,
-				int * intPtr);
+EXTERN int		Tcl_GetInt(Tcl_Interp *interp, const char *src,
+				int *intPtr);
 #endif
 #ifndef Tcl_GetIntFromObj_TCL_DECLARED
 #define Tcl_GetIntFromObj_TCL_DECLARED
 /* 38 */
-EXTERN int		Tcl_GetIntFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, int * intPtr);
+EXTERN int		Tcl_GetIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *intPtr);
 #endif
 #ifndef Tcl_GetLongFromObj_TCL_DECLARED
 #define Tcl_GetLongFromObj_TCL_DECLARED
 /* 39 */
-EXTERN int		Tcl_GetLongFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, long * longPtr);
+EXTERN int		Tcl_GetLongFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, long *longPtr);
 #endif
 #ifndef Tcl_GetObjType_TCL_DECLARED
 #define Tcl_GetObjType_TCL_DECLARED
 /* 40 */
-EXTERN CONST86 Tcl_ObjType * Tcl_GetObjType (const char * typeName);
+EXTERN CONST86 Tcl_ObjType * Tcl_GetObjType(const char *typeName);
 #endif
 #ifndef Tcl_GetStringFromObj_TCL_DECLARED
 #define Tcl_GetStringFromObj_TCL_DECLARED
 /* 41 */
-EXTERN char *		Tcl_GetStringFromObj (Tcl_Obj * objPtr,
-				int * lengthPtr);
+EXTERN char *		Tcl_GetStringFromObj(Tcl_Obj *objPtr, int *lengthPtr);
 #endif
 #ifndef Tcl_InvalidateStringRep_TCL_DECLARED
 #define Tcl_InvalidateStringRep_TCL_DECLARED
 /* 42 */
-EXTERN void		Tcl_InvalidateStringRep (Tcl_Obj * objPtr);
+EXTERN void		Tcl_InvalidateStringRep(Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_ListObjAppendList_TCL_DECLARED
 #define Tcl_ListObjAppendList_TCL_DECLARED
 /* 43 */
-EXTERN int		Tcl_ListObjAppendList (Tcl_Interp * interp,
-				Tcl_Obj * listPtr, Tcl_Obj * elemListPtr);
+EXTERN int		Tcl_ListObjAppendList(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Obj *elemListPtr);
 #endif
 #ifndef Tcl_ListObjAppendElement_TCL_DECLARED
 #define Tcl_ListObjAppendElement_TCL_DECLARED
 /* 44 */
-EXTERN int		Tcl_ListObjAppendElement (Tcl_Interp * interp,
-				Tcl_Obj * listPtr, Tcl_Obj * objPtr);
+EXTERN int		Tcl_ListObjAppendElement(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_ListObjGetElements_TCL_DECLARED
 #define Tcl_ListObjGetElements_TCL_DECLARED
 /* 45 */
-EXTERN int		Tcl_ListObjGetElements (Tcl_Interp * interp,
-				Tcl_Obj * listPtr, int * objcPtr,
-				Tcl_Obj *** objvPtr);
+EXTERN int		Tcl_ListObjGetElements(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int *objcPtr,
+				Tcl_Obj ***objvPtr);
 #endif
 #ifndef Tcl_ListObjIndex_TCL_DECLARED
 #define Tcl_ListObjIndex_TCL_DECLARED
 /* 46 */
-EXTERN int		Tcl_ListObjIndex (Tcl_Interp * interp,
-				Tcl_Obj * listPtr, int index,
-				Tcl_Obj ** objPtrPtr);
+EXTERN int		Tcl_ListObjIndex(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int index,
+				Tcl_Obj **objPtrPtr);
 #endif
 #ifndef Tcl_ListObjLength_TCL_DECLARED
 #define Tcl_ListObjLength_TCL_DECLARED
 /* 47 */
-EXTERN int		Tcl_ListObjLength (Tcl_Interp * interp,
-				Tcl_Obj * listPtr, int * lengthPtr);
+EXTERN int		Tcl_ListObjLength(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int *lengthPtr);
 #endif
 #ifndef Tcl_ListObjReplace_TCL_DECLARED
 #define Tcl_ListObjReplace_TCL_DECLARED
 /* 48 */
-EXTERN int		Tcl_ListObjReplace (Tcl_Interp * interp,
-				Tcl_Obj * listPtr, int first, int count,
+EXTERN int		Tcl_ListObjReplace(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int first, int count,
 				int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_NewBooleanObj_TCL_DECLARED
 #define Tcl_NewBooleanObj_TCL_DECLARED
 /* 49 */
-EXTERN Tcl_Obj *	Tcl_NewBooleanObj (int boolValue);
+EXTERN Tcl_Obj *	Tcl_NewBooleanObj(int boolValue);
 #endif
 #ifndef Tcl_NewByteArrayObj_TCL_DECLARED
 #define Tcl_NewByteArrayObj_TCL_DECLARED
 /* 50 */
-EXTERN Tcl_Obj *	Tcl_NewByteArrayObj (const unsigned char * bytes,
+EXTERN Tcl_Obj *	Tcl_NewByteArrayObj(const unsigned char *bytes,
 				int length);
 #endif
 #ifndef Tcl_NewDoubleObj_TCL_DECLARED
 #define Tcl_NewDoubleObj_TCL_DECLARED
 /* 51 */
-EXTERN Tcl_Obj *	Tcl_NewDoubleObj (double doubleValue);
+EXTERN Tcl_Obj *	Tcl_NewDoubleObj(double doubleValue);
 #endif
 #ifndef Tcl_NewIntObj_TCL_DECLARED
 #define Tcl_NewIntObj_TCL_DECLARED
 /* 52 */
-EXTERN Tcl_Obj *	Tcl_NewIntObj (int intValue);
+EXTERN Tcl_Obj *	Tcl_NewIntObj(int intValue);
 #endif
 #ifndef Tcl_NewListObj_TCL_DECLARED
 #define Tcl_NewListObj_TCL_DECLARED
 /* 53 */
-EXTERN Tcl_Obj *	Tcl_NewListObj (int objc, Tcl_Obj *const objv[]);
+EXTERN Tcl_Obj *	Tcl_NewListObj(int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_NewLongObj_TCL_DECLARED
 #define Tcl_NewLongObj_TCL_DECLARED
 /* 54 */
-EXTERN Tcl_Obj *	Tcl_NewLongObj (long longValue);
+EXTERN Tcl_Obj *	Tcl_NewLongObj(long longValue);
 #endif
 #ifndef Tcl_NewObj_TCL_DECLARED
 #define Tcl_NewObj_TCL_DECLARED
 /* 55 */
-EXTERN Tcl_Obj *	Tcl_NewObj (void);
+EXTERN Tcl_Obj *	Tcl_NewObj(void);
 #endif
 #ifndef Tcl_NewStringObj_TCL_DECLARED
 #define Tcl_NewStringObj_TCL_DECLARED
 /* 56 */
-EXTERN Tcl_Obj *	Tcl_NewStringObj (const char * bytes, int length);
+EXTERN Tcl_Obj *	Tcl_NewStringObj(const char *bytes, int length);
 #endif
 #ifndef Tcl_SetBooleanObj_TCL_DECLARED
 #define Tcl_SetBooleanObj_TCL_DECLARED
 /* 57 */
-EXTERN void		Tcl_SetBooleanObj (Tcl_Obj * objPtr, int boolValue);
+EXTERN void		Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue);
 #endif
 #ifndef Tcl_SetByteArrayLength_TCL_DECLARED
 #define Tcl_SetByteArrayLength_TCL_DECLARED
 /* 58 */
-EXTERN unsigned char *	Tcl_SetByteArrayLength (Tcl_Obj * objPtr, int length);
+EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int length);
 #endif
 #ifndef Tcl_SetByteArrayObj_TCL_DECLARED
 #define Tcl_SetByteArrayObj_TCL_DECLARED
 /* 59 */
-EXTERN void		Tcl_SetByteArrayObj (Tcl_Obj * objPtr,
-				const unsigned char * bytes, int length);
+EXTERN void		Tcl_SetByteArrayObj(Tcl_Obj *objPtr,
+				const unsigned char *bytes, int length);
 #endif
 #ifndef Tcl_SetDoubleObj_TCL_DECLARED
 #define Tcl_SetDoubleObj_TCL_DECLARED
 /* 60 */
-EXTERN void		Tcl_SetDoubleObj (Tcl_Obj * objPtr,
-				double doubleValue);
+EXTERN void		Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue);
 #endif
 #ifndef Tcl_SetIntObj_TCL_DECLARED
 #define Tcl_SetIntObj_TCL_DECLARED
 /* 61 */
-EXTERN void		Tcl_SetIntObj (Tcl_Obj * objPtr, int intValue);
+EXTERN void		Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue);
 #endif
 #ifndef Tcl_SetListObj_TCL_DECLARED
 #define Tcl_SetListObj_TCL_DECLARED
 /* 62 */
-EXTERN void		Tcl_SetListObj (Tcl_Obj * objPtr, int objc,
+EXTERN void		Tcl_SetListObj(Tcl_Obj *objPtr, int objc,
 				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_SetLongObj_TCL_DECLARED
 #define Tcl_SetLongObj_TCL_DECLARED
 /* 63 */
-EXTERN void		Tcl_SetLongObj (Tcl_Obj * objPtr, long longValue);
+EXTERN void		Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue);
 #endif
 #ifndef Tcl_SetObjLength_TCL_DECLARED
 #define Tcl_SetObjLength_TCL_DECLARED
 /* 64 */
-EXTERN void		Tcl_SetObjLength (Tcl_Obj * objPtr, int length);
+EXTERN void		Tcl_SetObjLength(Tcl_Obj *objPtr, int length);
 #endif
 #ifndef Tcl_SetStringObj_TCL_DECLARED
 #define Tcl_SetStringObj_TCL_DECLARED
 /* 65 */
-EXTERN void		Tcl_SetStringObj (Tcl_Obj * objPtr,
-				const char * bytes, int length);
+EXTERN void		Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes,
+				int length);
 #endif
 #ifndef Tcl_AddErrorInfo_TCL_DECLARED
 #define Tcl_AddErrorInfo_TCL_DECLARED
 /* 66 */
-EXTERN void		Tcl_AddErrorInfo (Tcl_Interp * interp,
-				const char * message);
+EXTERN void		Tcl_AddErrorInfo(Tcl_Interp *interp,
+				const char *message);
 #endif
 #ifndef Tcl_AddObjErrorInfo_TCL_DECLARED
 #define Tcl_AddObjErrorInfo_TCL_DECLARED
 /* 67 */
-EXTERN void		Tcl_AddObjErrorInfo (Tcl_Interp * interp,
-				const char * message, int length);
+EXTERN void		Tcl_AddObjErrorInfo(Tcl_Interp *interp,
+				const char *message, int length);
 #endif
 #ifndef Tcl_AllowExceptions_TCL_DECLARED
 #define Tcl_AllowExceptions_TCL_DECLARED
 /* 68 */
-EXTERN void		Tcl_AllowExceptions (Tcl_Interp * interp);
+EXTERN void		Tcl_AllowExceptions(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_AppendElement_TCL_DECLARED
 #define Tcl_AppendElement_TCL_DECLARED
 /* 69 */
-EXTERN void		Tcl_AppendElement (Tcl_Interp * interp,
-				const char * element);
+EXTERN void		Tcl_AppendElement(Tcl_Interp *interp,
+				const char *element);
 #endif
 #ifndef Tcl_AppendResult_TCL_DECLARED
 #define Tcl_AppendResult_TCL_DECLARED
 /* 70 */
-EXTERN void		Tcl_AppendResult (Tcl_Interp * interp, ...);
+EXTERN void		Tcl_AppendResult(Tcl_Interp *interp, ...);
 #endif
 #ifndef Tcl_AsyncCreate_TCL_DECLARED
 #define Tcl_AsyncCreate_TCL_DECLARED
 /* 71 */
-EXTERN Tcl_AsyncHandler	 Tcl_AsyncCreate (Tcl_AsyncProc * proc,
+EXTERN Tcl_AsyncHandler	 Tcl_AsyncCreate(Tcl_AsyncProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_AsyncDelete_TCL_DECLARED
 #define Tcl_AsyncDelete_TCL_DECLARED
 /* 72 */
-EXTERN void		Tcl_AsyncDelete (Tcl_AsyncHandler async);
+EXTERN void		Tcl_AsyncDelete(Tcl_AsyncHandler async);
 #endif
 #ifndef Tcl_AsyncInvoke_TCL_DECLARED
 #define Tcl_AsyncInvoke_TCL_DECLARED
 /* 73 */
-EXTERN int		Tcl_AsyncInvoke (Tcl_Interp * interp, int code);
+EXTERN int		Tcl_AsyncInvoke(Tcl_Interp *interp, int code);
 #endif
 #ifndef Tcl_AsyncMark_TCL_DECLARED
 #define Tcl_AsyncMark_TCL_DECLARED
 /* 74 */
-EXTERN void		Tcl_AsyncMark (Tcl_AsyncHandler async);
+EXTERN void		Tcl_AsyncMark(Tcl_AsyncHandler async);
 #endif
 #ifndef Tcl_AsyncReady_TCL_DECLARED
 #define Tcl_AsyncReady_TCL_DECLARED
 /* 75 */
-EXTERN int		Tcl_AsyncReady (void);
+EXTERN int		Tcl_AsyncReady(void);
 #endif
 #ifndef Tcl_BackgroundError_TCL_DECLARED
 #define Tcl_BackgroundError_TCL_DECLARED
 /* 76 */
-EXTERN void		Tcl_BackgroundError (Tcl_Interp * interp);
+EXTERN void		Tcl_BackgroundError(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_Backslash_TCL_DECLARED
 #define Tcl_Backslash_TCL_DECLARED
 /* 77 */
-EXTERN char		Tcl_Backslash (const char * src, int * readPtr);
+EXTERN char		Tcl_Backslash(const char *src, int *readPtr);
 #endif
 #ifndef Tcl_BadChannelOption_TCL_DECLARED
 #define Tcl_BadChannelOption_TCL_DECLARED
 /* 78 */
-EXTERN int		Tcl_BadChannelOption (Tcl_Interp * interp,
-				const char * optionName,
-				const char * optionList);
+EXTERN int		Tcl_BadChannelOption(Tcl_Interp *interp,
+				const char *optionName,
+				const char *optionList);
 #endif
 #ifndef Tcl_CallWhenDeleted_TCL_DECLARED
 #define Tcl_CallWhenDeleted_TCL_DECLARED
 /* 79 */
-EXTERN void		Tcl_CallWhenDeleted (Tcl_Interp * interp,
-				Tcl_InterpDeleteProc * proc,
+EXTERN void		Tcl_CallWhenDeleted(Tcl_Interp *interp,
+				Tcl_InterpDeleteProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_CancelIdleCall_TCL_DECLARED
 #define Tcl_CancelIdleCall_TCL_DECLARED
 /* 80 */
-EXTERN void		Tcl_CancelIdleCall (Tcl_IdleProc * idleProc,
+EXTERN void		Tcl_CancelIdleCall(Tcl_IdleProc *idleProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_Close_TCL_DECLARED
 #define Tcl_Close_TCL_DECLARED
 /* 81 */
-EXTERN int		Tcl_Close (Tcl_Interp * interp, Tcl_Channel chan);
+EXTERN int		Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan);
 #endif
 #ifndef Tcl_CommandComplete_TCL_DECLARED
 #define Tcl_CommandComplete_TCL_DECLARED
 /* 82 */
-EXTERN int		Tcl_CommandComplete (const char * cmd);
+EXTERN int		Tcl_CommandComplete(const char *cmd);
 #endif
 #ifndef Tcl_Concat_TCL_DECLARED
 #define Tcl_Concat_TCL_DECLARED
 /* 83 */
-EXTERN char *		Tcl_Concat (int argc, CONST84 char *const * argv);
+EXTERN char *		Tcl_Concat(int argc, CONST84 char *const *argv);
 #endif
 #ifndef Tcl_ConvertElement_TCL_DECLARED
 #define Tcl_ConvertElement_TCL_DECLARED
 /* 84 */
-EXTERN int		Tcl_ConvertElement (const char * src, char * dst,
+EXTERN int		Tcl_ConvertElement(const char *src, char *dst,
 				int flags);
 #endif
 #ifndef Tcl_ConvertCountedElement_TCL_DECLARED
 #define Tcl_ConvertCountedElement_TCL_DECLARED
 /* 85 */
-EXTERN int		Tcl_ConvertCountedElement (const char * src,
-				int length, char * dst, int flags);
+EXTERN int		Tcl_ConvertCountedElement(const char *src,
+				int length, char *dst, int flags);
 #endif
 #ifndef Tcl_CreateAlias_TCL_DECLARED
 #define Tcl_CreateAlias_TCL_DECLARED
 /* 86 */
-EXTERN int		Tcl_CreateAlias (Tcl_Interp * slave,
-				const char * slaveCmd, Tcl_Interp * target,
-				const char * targetCmd, int argc,
-				CONST84 char *const * argv);
+EXTERN int		Tcl_CreateAlias(Tcl_Interp *slave,
+				const char *slaveCmd, Tcl_Interp *target,
+				const char *targetCmd, int argc,
+				CONST84 char *const *argv);
 #endif
 #ifndef Tcl_CreateAliasObj_TCL_DECLARED
 #define Tcl_CreateAliasObj_TCL_DECLARED
 /* 87 */
-EXTERN int		Tcl_CreateAliasObj (Tcl_Interp * slave,
-				const char * slaveCmd, Tcl_Interp * target,
-				const char * targetCmd, int objc,
+EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *slave,
+				const char *slaveCmd, Tcl_Interp *target,
+				const char *targetCmd, int objc,
 				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_CreateChannel_TCL_DECLARED
 #define Tcl_CreateChannel_TCL_DECLARED
 /* 88 */
-EXTERN Tcl_Channel	Tcl_CreateChannel (const Tcl_ChannelType * typePtr,
-				const char * chanName,
+EXTERN Tcl_Channel	Tcl_CreateChannel(const Tcl_ChannelType *typePtr,
+				const char *chanName,
 				ClientData instanceData, int mask);
 #endif
 #ifndef Tcl_CreateChannelHandler_TCL_DECLARED
 #define Tcl_CreateChannelHandler_TCL_DECLARED
 /* 89 */
-EXTERN void		Tcl_CreateChannelHandler (Tcl_Channel chan, int mask,
-				Tcl_ChannelProc * proc,
-				ClientData clientData);
+EXTERN void		Tcl_CreateChannelHandler(Tcl_Channel chan, int mask,
+				Tcl_ChannelProc *proc, ClientData clientData);
 #endif
 #ifndef Tcl_CreateCloseHandler_TCL_DECLARED
 #define Tcl_CreateCloseHandler_TCL_DECLARED
 /* 90 */
-EXTERN void		Tcl_CreateCloseHandler (Tcl_Channel chan,
-				Tcl_CloseProc * proc, ClientData clientData);
+EXTERN void		Tcl_CreateCloseHandler(Tcl_Channel chan,
+				Tcl_CloseProc *proc, ClientData clientData);
 #endif
 #ifndef Tcl_CreateCommand_TCL_DECLARED
 #define Tcl_CreateCommand_TCL_DECLARED
 /* 91 */
-EXTERN Tcl_Command	Tcl_CreateCommand (Tcl_Interp * interp,
-				const char * cmdName, Tcl_CmdProc * proc,
+EXTERN Tcl_Command	Tcl_CreateCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_CmdProc *proc,
 				ClientData clientData,
-				Tcl_CmdDeleteProc * deleteProc);
+				Tcl_CmdDeleteProc *deleteProc);
 #endif
 #ifndef Tcl_CreateEventSource_TCL_DECLARED
 #define Tcl_CreateEventSource_TCL_DECLARED
 /* 92 */
-EXTERN void		Tcl_CreateEventSource (
-				Tcl_EventSetupProc * setupProc,
-				Tcl_EventCheckProc * checkProc,
+EXTERN void		Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc,
+				Tcl_EventCheckProc *checkProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_CreateExitHandler_TCL_DECLARED
 #define Tcl_CreateExitHandler_TCL_DECLARED
 /* 93 */
-EXTERN void		Tcl_CreateExitHandler (Tcl_ExitProc * proc,
+EXTERN void		Tcl_CreateExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_CreateInterp_TCL_DECLARED
 #define Tcl_CreateInterp_TCL_DECLARED
 /* 94 */
-EXTERN Tcl_Interp *	Tcl_CreateInterp (void);
+EXTERN Tcl_Interp *	Tcl_CreateInterp(void);
 #endif
 #ifndef Tcl_CreateMathFunc_TCL_DECLARED
 #define Tcl_CreateMathFunc_TCL_DECLARED
 /* 95 */
-EXTERN void		Tcl_CreateMathFunc (Tcl_Interp * interp,
-				const char * name, int numArgs,
-				Tcl_ValueType * argTypes,
-				Tcl_MathProc * proc, ClientData clientData);
+EXTERN void		Tcl_CreateMathFunc(Tcl_Interp *interp,
+				const char *name, int numArgs,
+				Tcl_ValueType *argTypes, Tcl_MathProc *proc,
+				ClientData clientData);
 #endif
 #ifndef Tcl_CreateObjCommand_TCL_DECLARED
 #define Tcl_CreateObjCommand_TCL_DECLARED
 /* 96 */
-EXTERN Tcl_Command	Tcl_CreateObjCommand (Tcl_Interp * interp,
-				const char * cmdName, Tcl_ObjCmdProc * proc,
+EXTERN Tcl_Command	Tcl_CreateObjCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc *proc,
 				ClientData clientData,
-				Tcl_CmdDeleteProc * deleteProc);
+				Tcl_CmdDeleteProc *deleteProc);
 #endif
 #ifndef Tcl_CreateSlave_TCL_DECLARED
 #define Tcl_CreateSlave_TCL_DECLARED
 /* 97 */
-EXTERN Tcl_Interp *	Tcl_CreateSlave (Tcl_Interp * interp,
-				const char * slaveName, int isSafe);
+EXTERN Tcl_Interp *	Tcl_CreateSlave(Tcl_Interp *interp,
+				const char *slaveName, int isSafe);
 #endif
 #ifndef Tcl_CreateTimerHandler_TCL_DECLARED
 #define Tcl_CreateTimerHandler_TCL_DECLARED
 /* 98 */
-EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler (int milliseconds,
-				Tcl_TimerProc * proc, ClientData clientData);
+EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler(int milliseconds,
+				Tcl_TimerProc *proc, ClientData clientData);
 #endif
 #ifndef Tcl_CreateTrace_TCL_DECLARED
 #define Tcl_CreateTrace_TCL_DECLARED
 /* 99 */
-EXTERN Tcl_Trace	Tcl_CreateTrace (Tcl_Interp * interp, int level,
-				Tcl_CmdTraceProc * proc,
+EXTERN Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, int level,
+				Tcl_CmdTraceProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteAssocData_TCL_DECLARED
 #define Tcl_DeleteAssocData_TCL_DECLARED
 /* 100 */
-EXTERN void		Tcl_DeleteAssocData (Tcl_Interp * interp,
-				const char * name);
+EXTERN void		Tcl_DeleteAssocData(Tcl_Interp *interp,
+				const char *name);
 #endif
 #ifndef Tcl_DeleteChannelHandler_TCL_DECLARED
 #define Tcl_DeleteChannelHandler_TCL_DECLARED
 /* 101 */
-EXTERN void		Tcl_DeleteChannelHandler (Tcl_Channel chan,
-				Tcl_ChannelProc * proc,
-				ClientData clientData);
+EXTERN void		Tcl_DeleteChannelHandler(Tcl_Channel chan,
+				Tcl_ChannelProc *proc, ClientData clientData);
 #endif
 #ifndef Tcl_DeleteCloseHandler_TCL_DECLARED
 #define Tcl_DeleteCloseHandler_TCL_DECLARED
 /* 102 */
-EXTERN void		Tcl_DeleteCloseHandler (Tcl_Channel chan,
-				Tcl_CloseProc * proc, ClientData clientData);
+EXTERN void		Tcl_DeleteCloseHandler(Tcl_Channel chan,
+				Tcl_CloseProc *proc, ClientData clientData);
 #endif
 #ifndef Tcl_DeleteCommand_TCL_DECLARED
 #define Tcl_DeleteCommand_TCL_DECLARED
 /* 103 */
-EXTERN int		Tcl_DeleteCommand (Tcl_Interp * interp,
-				const char * cmdName);
+EXTERN int		Tcl_DeleteCommand(Tcl_Interp *interp,
+				const char *cmdName);
 #endif
 #ifndef Tcl_DeleteCommandFromToken_TCL_DECLARED
 #define Tcl_DeleteCommandFromToken_TCL_DECLARED
 /* 104 */
-EXTERN int		Tcl_DeleteCommandFromToken (Tcl_Interp * interp,
+EXTERN int		Tcl_DeleteCommandFromToken(Tcl_Interp *interp,
 				Tcl_Command command);
 #endif
 #ifndef Tcl_DeleteEvents_TCL_DECLARED
 #define Tcl_DeleteEvents_TCL_DECLARED
 /* 105 */
-EXTERN void		Tcl_DeleteEvents (Tcl_EventDeleteProc * proc,
+EXTERN void		Tcl_DeleteEvents(Tcl_EventDeleteProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteEventSource_TCL_DECLARED
 #define Tcl_DeleteEventSource_TCL_DECLARED
 /* 106 */
-EXTERN void		Tcl_DeleteEventSource (
-				Tcl_EventSetupProc * setupProc,
-				Tcl_EventCheckProc * checkProc,
+EXTERN void		Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc,
+				Tcl_EventCheckProc *checkProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteExitHandler_TCL_DECLARED
 #define Tcl_DeleteExitHandler_TCL_DECLARED
 /* 107 */
-EXTERN void		Tcl_DeleteExitHandler (Tcl_ExitProc * proc,
+EXTERN void		Tcl_DeleteExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteHashEntry_TCL_DECLARED
 #define Tcl_DeleteHashEntry_TCL_DECLARED
 /* 108 */
-EXTERN void		Tcl_DeleteHashEntry (Tcl_HashEntry * entryPtr);
+EXTERN void		Tcl_DeleteHashEntry(Tcl_HashEntry *entryPtr);
 #endif
 #ifndef Tcl_DeleteHashTable_TCL_DECLARED
 #define Tcl_DeleteHashTable_TCL_DECLARED
 /* 109 */
-EXTERN void		Tcl_DeleteHashTable (Tcl_HashTable * tablePtr);
+EXTERN void		Tcl_DeleteHashTable(Tcl_HashTable *tablePtr);
 #endif
 #ifndef Tcl_DeleteInterp_TCL_DECLARED
 #define Tcl_DeleteInterp_TCL_DECLARED
 /* 110 */
-EXTERN void		Tcl_DeleteInterp (Tcl_Interp * interp);
+EXTERN void		Tcl_DeleteInterp(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_DetachPids_TCL_DECLARED
 #define Tcl_DetachPids_TCL_DECLARED
 /* 111 */
-EXTERN void		Tcl_DetachPids (int numPids, Tcl_Pid * pidPtr);
+EXTERN void		Tcl_DetachPids(int numPids, Tcl_Pid *pidPtr);
 #endif
 #ifndef Tcl_DeleteTimerHandler_TCL_DECLARED
 #define Tcl_DeleteTimerHandler_TCL_DECLARED
 /* 112 */
-EXTERN void		Tcl_DeleteTimerHandler (Tcl_TimerToken token);
+EXTERN void		Tcl_DeleteTimerHandler(Tcl_TimerToken token);
 #endif
 #ifndef Tcl_DeleteTrace_TCL_DECLARED
 #define Tcl_DeleteTrace_TCL_DECLARED
 /* 113 */
-EXTERN void		Tcl_DeleteTrace (Tcl_Interp * interp,
-				Tcl_Trace trace);
+EXTERN void		Tcl_DeleteTrace(Tcl_Interp *interp, Tcl_Trace trace);
 #endif
 #ifndef Tcl_DontCallWhenDeleted_TCL_DECLARED
 #define Tcl_DontCallWhenDeleted_TCL_DECLARED
 /* 114 */
-EXTERN void		Tcl_DontCallWhenDeleted (Tcl_Interp * interp,
-				Tcl_InterpDeleteProc * proc,
+EXTERN void		Tcl_DontCallWhenDeleted(Tcl_Interp *interp,
+				Tcl_InterpDeleteProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DoOneEvent_TCL_DECLARED
 #define Tcl_DoOneEvent_TCL_DECLARED
 /* 115 */
-EXTERN int		Tcl_DoOneEvent (int flags);
+EXTERN int		Tcl_DoOneEvent(int flags);
 #endif
 #ifndef Tcl_DoWhenIdle_TCL_DECLARED
 #define Tcl_DoWhenIdle_TCL_DECLARED
 /* 116 */
-EXTERN void		Tcl_DoWhenIdle (Tcl_IdleProc * proc,
+EXTERN void		Tcl_DoWhenIdle(Tcl_IdleProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DStringAppend_TCL_DECLARED
 #define Tcl_DStringAppend_TCL_DECLARED
 /* 117 */
-EXTERN char *		Tcl_DStringAppend (Tcl_DString * dsPtr,
-				const char * bytes, int length);
+EXTERN char *		Tcl_DStringAppend(Tcl_DString *dsPtr,
+				const char *bytes, int length);
 #endif
 #ifndef Tcl_DStringAppendElement_TCL_DECLARED
 #define Tcl_DStringAppendElement_TCL_DECLARED
 /* 118 */
-EXTERN char *		Tcl_DStringAppendElement (Tcl_DString * dsPtr,
-				const char * element);
+EXTERN char *		Tcl_DStringAppendElement(Tcl_DString *dsPtr,
+				const char *element);
 #endif
 #ifndef Tcl_DStringEndSublist_TCL_DECLARED
 #define Tcl_DStringEndSublist_TCL_DECLARED
 /* 119 */
-EXTERN void		Tcl_DStringEndSublist (Tcl_DString * dsPtr);
+EXTERN void		Tcl_DStringEndSublist(Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_DStringFree_TCL_DECLARED
 #define Tcl_DStringFree_TCL_DECLARED
 /* 120 */
-EXTERN void		Tcl_DStringFree (Tcl_DString * dsPtr);
+EXTERN void		Tcl_DStringFree(Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_DStringGetResult_TCL_DECLARED
 #define Tcl_DStringGetResult_TCL_DECLARED
 /* 121 */
-EXTERN void		Tcl_DStringGetResult (Tcl_Interp * interp,
-				Tcl_DString * dsPtr);
+EXTERN void		Tcl_DStringGetResult(Tcl_Interp *interp,
+				Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_DStringInit_TCL_DECLARED
 #define Tcl_DStringInit_TCL_DECLARED
 /* 122 */
-EXTERN void		Tcl_DStringInit (Tcl_DString * dsPtr);
+EXTERN void		Tcl_DStringInit(Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_DStringResult_TCL_DECLARED
 #define Tcl_DStringResult_TCL_DECLARED
 /* 123 */
-EXTERN void		Tcl_DStringResult (Tcl_Interp * interp,
-				Tcl_DString * dsPtr);
+EXTERN void		Tcl_DStringResult(Tcl_Interp *interp,
+				Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_DStringSetLength_TCL_DECLARED
 #define Tcl_DStringSetLength_TCL_DECLARED
 /* 124 */
-EXTERN void		Tcl_DStringSetLength (Tcl_DString * dsPtr,
-				int length);
+EXTERN void		Tcl_DStringSetLength(Tcl_DString *dsPtr, int length);
 #endif
 #ifndef Tcl_DStringStartSublist_TCL_DECLARED
 #define Tcl_DStringStartSublist_TCL_DECLARED
 /* 125 */
-EXTERN void		Tcl_DStringStartSublist (Tcl_DString * dsPtr);
+EXTERN void		Tcl_DStringStartSublist(Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_Eof_TCL_DECLARED
 #define Tcl_Eof_TCL_DECLARED
 /* 126 */
-EXTERN int		Tcl_Eof (Tcl_Channel chan);
+EXTERN int		Tcl_Eof(Tcl_Channel chan);
 #endif
 #ifndef Tcl_ErrnoId_TCL_DECLARED
 #define Tcl_ErrnoId_TCL_DECLARED
 /* 127 */
-EXTERN CONST84_RETURN char * Tcl_ErrnoId (void);
+EXTERN CONST84_RETURN char * Tcl_ErrnoId(void);
 #endif
 #ifndef Tcl_ErrnoMsg_TCL_DECLARED
 #define Tcl_ErrnoMsg_TCL_DECLARED
 /* 128 */
-EXTERN CONST84_RETURN char * Tcl_ErrnoMsg (int err);
+EXTERN CONST84_RETURN char * Tcl_ErrnoMsg(int err);
 #endif
 #ifndef Tcl_Eval_TCL_DECLARED
 #define Tcl_Eval_TCL_DECLARED
 /* 129 */
-EXTERN int		Tcl_Eval (Tcl_Interp * interp, const char * script);
+EXTERN int		Tcl_Eval(Tcl_Interp *interp, const char *script);
 #endif
 #ifndef Tcl_EvalFile_TCL_DECLARED
 #define Tcl_EvalFile_TCL_DECLARED
 /* 130 */
-EXTERN int		Tcl_EvalFile (Tcl_Interp * interp,
-				const char * fileName);
+EXTERN int		Tcl_EvalFile(Tcl_Interp *interp,
+				const char *fileName);
 #endif
 #ifndef Tcl_EvalObj_TCL_DECLARED
 #define Tcl_EvalObj_TCL_DECLARED
 /* 131 */
-EXTERN int		Tcl_EvalObj (Tcl_Interp * interp, Tcl_Obj * objPtr);
+EXTERN int		Tcl_EvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_EventuallyFree_TCL_DECLARED
 #define Tcl_EventuallyFree_TCL_DECLARED
 /* 132 */
-EXTERN void		Tcl_EventuallyFree (ClientData clientData,
-				Tcl_FreeProc * freeProc);
+EXTERN void		Tcl_EventuallyFree(ClientData clientData,
+				Tcl_FreeProc *freeProc);
 #endif
 #ifndef Tcl_Exit_TCL_DECLARED
 #define Tcl_Exit_TCL_DECLARED
 /* 133 */
-EXTERN void		Tcl_Exit (int status);
+EXTERN void		Tcl_Exit(int status);
 #endif
 #ifndef Tcl_ExposeCommand_TCL_DECLARED
 #define Tcl_ExposeCommand_TCL_DECLARED
 /* 134 */
-EXTERN int		Tcl_ExposeCommand (Tcl_Interp * interp,
-				const char * hiddenCmdToken,
-				const char * cmdName);
+EXTERN int		Tcl_ExposeCommand(Tcl_Interp *interp,
+				const char *hiddenCmdToken,
+				const char *cmdName);
 #endif
 #ifndef Tcl_ExprBoolean_TCL_DECLARED
 #define Tcl_ExprBoolean_TCL_DECLARED
 /* 135 */
-EXTERN int		Tcl_ExprBoolean (Tcl_Interp * interp,
-				const char * expr, int * ptr);
+EXTERN int		Tcl_ExprBoolean(Tcl_Interp *interp, const char *expr,
+				int *ptr);
 #endif
 #ifndef Tcl_ExprBooleanObj_TCL_DECLARED
 #define Tcl_ExprBooleanObj_TCL_DECLARED
 /* 136 */
-EXTERN int		Tcl_ExprBooleanObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, int * ptr);
+EXTERN int		Tcl_ExprBooleanObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *ptr);
 #endif
 #ifndef Tcl_ExprDouble_TCL_DECLARED
 #define Tcl_ExprDouble_TCL_DECLARED
 /* 137 */
-EXTERN int		Tcl_ExprDouble (Tcl_Interp * interp,
-				const char * expr, double * ptr);
+EXTERN int		Tcl_ExprDouble(Tcl_Interp *interp, const char *expr,
+				double *ptr);
 #endif
 #ifndef Tcl_ExprDoubleObj_TCL_DECLARED
 #define Tcl_ExprDoubleObj_TCL_DECLARED
 /* 138 */
-EXTERN int		Tcl_ExprDoubleObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, double * ptr);
+EXTERN int		Tcl_ExprDoubleObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, double *ptr);
 #endif
 #ifndef Tcl_ExprLong_TCL_DECLARED
 #define Tcl_ExprLong_TCL_DECLARED
 /* 139 */
-EXTERN int		Tcl_ExprLong (Tcl_Interp * interp, const char * expr,
-				long * ptr);
+EXTERN int		Tcl_ExprLong(Tcl_Interp *interp, const char *expr,
+				long *ptr);
 #endif
 #ifndef Tcl_ExprLongObj_TCL_DECLARED
 #define Tcl_ExprLongObj_TCL_DECLARED
 /* 140 */
-EXTERN int		Tcl_ExprLongObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, long * ptr);
+EXTERN int		Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				long *ptr);
 #endif
 #ifndef Tcl_ExprObj_TCL_DECLARED
 #define Tcl_ExprObj_TCL_DECLARED
 /* 141 */
-EXTERN int		Tcl_ExprObj (Tcl_Interp * interp, Tcl_Obj * objPtr,
-				Tcl_Obj ** resultPtrPtr);
+EXTERN int		Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				Tcl_Obj **resultPtrPtr);
 #endif
 #ifndef Tcl_ExprString_TCL_DECLARED
 #define Tcl_ExprString_TCL_DECLARED
 /* 142 */
-EXTERN int		Tcl_ExprString (Tcl_Interp * interp,
-				const char * expr);
+EXTERN int		Tcl_ExprString(Tcl_Interp *interp, const char *expr);
 #endif
 #ifndef Tcl_Finalize_TCL_DECLARED
 #define Tcl_Finalize_TCL_DECLARED
 /* 143 */
-EXTERN void		Tcl_Finalize (void);
+EXTERN void		Tcl_Finalize(void);
 #endif
 #ifndef Tcl_FindExecutable_TCL_DECLARED
 #define Tcl_FindExecutable_TCL_DECLARED
 /* 144 */
-EXTERN void		Tcl_FindExecutable (const char * argv0);
+EXTERN void		Tcl_FindExecutable(const char *argv0);
 #endif
 #ifndef Tcl_FirstHashEntry_TCL_DECLARED
 #define Tcl_FirstHashEntry_TCL_DECLARED
 /* 145 */
-EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry (Tcl_HashTable * tablePtr,
-				Tcl_HashSearch * searchPtr);
+EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
+				Tcl_HashSearch *searchPtr);
 #endif
 #ifndef Tcl_Flush_TCL_DECLARED
 #define Tcl_Flush_TCL_DECLARED
 /* 146 */
-EXTERN int		Tcl_Flush (Tcl_Channel chan);
+EXTERN int		Tcl_Flush(Tcl_Channel chan);
 #endif
 #ifndef Tcl_FreeResult_TCL_DECLARED
 #define Tcl_FreeResult_TCL_DECLARED
 /* 147 */
-EXTERN void		Tcl_FreeResult (Tcl_Interp * interp);
+EXTERN void		Tcl_FreeResult(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_GetAlias_TCL_DECLARED
 #define Tcl_GetAlias_TCL_DECLARED
 /* 148 */
-EXTERN int		Tcl_GetAlias (Tcl_Interp * interp,
-				const char * slaveCmd,
-				Tcl_Interp ** targetInterpPtr,
-				CONST84 char ** targetCmdPtr, int * argcPtr,
-				CONST84 char *** argvPtr);
+EXTERN int		Tcl_GetAlias(Tcl_Interp *interp,
+				const char *slaveCmd,
+				Tcl_Interp **targetInterpPtr,
+				CONST84 char **targetCmdPtr, int *argcPtr,
+				CONST84 char ***argvPtr);
 #endif
 #ifndef Tcl_GetAliasObj_TCL_DECLARED
 #define Tcl_GetAliasObj_TCL_DECLARED
 /* 149 */
-EXTERN int		Tcl_GetAliasObj (Tcl_Interp * interp,
-				const char * slaveCmd,
-				Tcl_Interp ** targetInterpPtr,
-				CONST84 char ** targetCmdPtr, int * objcPtr,
-				Tcl_Obj *** objv);
+EXTERN int		Tcl_GetAliasObj(Tcl_Interp *interp,
+				const char *slaveCmd,
+				Tcl_Interp **targetInterpPtr,
+				CONST84 char **targetCmdPtr, int *objcPtr,
+				Tcl_Obj ***objv);
 #endif
 #ifndef Tcl_GetAssocData_TCL_DECLARED
 #define Tcl_GetAssocData_TCL_DECLARED
 /* 150 */
-EXTERN ClientData	Tcl_GetAssocData (Tcl_Interp * interp,
-				const char * name,
-				Tcl_InterpDeleteProc ** procPtr);
+EXTERN ClientData	Tcl_GetAssocData(Tcl_Interp *interp,
+				const char *name,
+				Tcl_InterpDeleteProc **procPtr);
 #endif
 #ifndef Tcl_GetChannel_TCL_DECLARED
 #define Tcl_GetChannel_TCL_DECLARED
 /* 151 */
-EXTERN Tcl_Channel	Tcl_GetChannel (Tcl_Interp * interp,
-				const char * chanName, int * modePtr);
+EXTERN Tcl_Channel	Tcl_GetChannel(Tcl_Interp *interp,
+				const char *chanName, int *modePtr);
 #endif
 #ifndef Tcl_GetChannelBufferSize_TCL_DECLARED
 #define Tcl_GetChannelBufferSize_TCL_DECLARED
 /* 152 */
-EXTERN int		Tcl_GetChannelBufferSize (Tcl_Channel chan);
+EXTERN int		Tcl_GetChannelBufferSize(Tcl_Channel chan);
 #endif
 #ifndef Tcl_GetChannelHandle_TCL_DECLARED
 #define Tcl_GetChannelHandle_TCL_DECLARED
 /* 153 */
-EXTERN int		Tcl_GetChannelHandle (Tcl_Channel chan,
-				int direction, ClientData * handlePtr);
+EXTERN int		Tcl_GetChannelHandle(Tcl_Channel chan, int direction,
+				ClientData *handlePtr);
 #endif
 #ifndef Tcl_GetChannelInstanceData_TCL_DECLARED
 #define Tcl_GetChannelInstanceData_TCL_DECLARED
 /* 154 */
-EXTERN ClientData	Tcl_GetChannelInstanceData (Tcl_Channel chan);
+EXTERN ClientData	Tcl_GetChannelInstanceData(Tcl_Channel chan);
 #endif
 #ifndef Tcl_GetChannelMode_TCL_DECLARED
 #define Tcl_GetChannelMode_TCL_DECLARED
 /* 155 */
-EXTERN int		Tcl_GetChannelMode (Tcl_Channel chan);
+EXTERN int		Tcl_GetChannelMode(Tcl_Channel chan);
 #endif
 #ifndef Tcl_GetChannelName_TCL_DECLARED
 #define Tcl_GetChannelName_TCL_DECLARED
 /* 156 */
-EXTERN CONST84_RETURN char * Tcl_GetChannelName (Tcl_Channel chan);
+EXTERN CONST84_RETURN char * Tcl_GetChannelName(Tcl_Channel chan);
 #endif
 #ifndef Tcl_GetChannelOption_TCL_DECLARED
 #define Tcl_GetChannelOption_TCL_DECLARED
 /* 157 */
-EXTERN int		Tcl_GetChannelOption (Tcl_Interp * interp,
-				Tcl_Channel chan, const char * optionName,
-				Tcl_DString * dsPtr);
+EXTERN int		Tcl_GetChannelOption(Tcl_Interp *interp,
+				Tcl_Channel chan, const char *optionName,
+				Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_GetChannelType_TCL_DECLARED
 #define Tcl_GetChannelType_TCL_DECLARED
 /* 158 */
-EXTERN CONST86 Tcl_ChannelType * Tcl_GetChannelType (Tcl_Channel chan);
+EXTERN CONST86 Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan);
 #endif
 #ifndef Tcl_GetCommandInfo_TCL_DECLARED
 #define Tcl_GetCommandInfo_TCL_DECLARED
 /* 159 */
-EXTERN int		Tcl_GetCommandInfo (Tcl_Interp * interp,
-				const char * cmdName, Tcl_CmdInfo * infoPtr);
+EXTERN int		Tcl_GetCommandInfo(Tcl_Interp *interp,
+				const char *cmdName, Tcl_CmdInfo *infoPtr);
 #endif
 #ifndef Tcl_GetCommandName_TCL_DECLARED
 #define Tcl_GetCommandName_TCL_DECLARED
 /* 160 */
-EXTERN CONST84_RETURN char * Tcl_GetCommandName (Tcl_Interp * interp,
+EXTERN CONST84_RETURN char * Tcl_GetCommandName(Tcl_Interp *interp,
 				Tcl_Command command);
 #endif
 #ifndef Tcl_GetErrno_TCL_DECLARED
 #define Tcl_GetErrno_TCL_DECLARED
 /* 161 */
-EXTERN int		Tcl_GetErrno (void);
+EXTERN int		Tcl_GetErrno(void);
 #endif
 #ifndef Tcl_GetHostName_TCL_DECLARED
 #define Tcl_GetHostName_TCL_DECLARED
 /* 162 */
-EXTERN CONST84_RETURN char * Tcl_GetHostName (void);
+EXTERN CONST84_RETURN char * Tcl_GetHostName(void);
 #endif
 #ifndef Tcl_GetInterpPath_TCL_DECLARED
 #define Tcl_GetInterpPath_TCL_DECLARED
 /* 163 */
-EXTERN int		Tcl_GetInterpPath (Tcl_Interp * askInterp,
-				Tcl_Interp * slaveInterp);
+EXTERN int		Tcl_GetInterpPath(Tcl_Interp *askInterp,
+				Tcl_Interp *slaveInterp);
 #endif
 #ifndef Tcl_GetMaster_TCL_DECLARED
 #define Tcl_GetMaster_TCL_DECLARED
 /* 164 */
-EXTERN Tcl_Interp *	Tcl_GetMaster (Tcl_Interp * interp);
+EXTERN Tcl_Interp *	Tcl_GetMaster(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_GetNameOfExecutable_TCL_DECLARED
 #define Tcl_GetNameOfExecutable_TCL_DECLARED
 /* 165 */
-EXTERN const char *	Tcl_GetNameOfExecutable (void);
+EXTERN const char *	Tcl_GetNameOfExecutable(void);
 #endif
 #ifndef Tcl_GetObjResult_TCL_DECLARED
 #define Tcl_GetObjResult_TCL_DECLARED
 /* 166 */
-EXTERN Tcl_Obj *	Tcl_GetObjResult (Tcl_Interp * interp);
+EXTERN Tcl_Obj *	Tcl_GetObjResult(Tcl_Interp *interp);
 #endif
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
 #ifndef Tcl_GetOpenFile_TCL_DECLARED
 #define Tcl_GetOpenFile_TCL_DECLARED
 /* 167 */
-EXTERN int		Tcl_GetOpenFile (Tcl_Interp * interp,
-				const char * chanID, int forWriting,
-				int checkUsage, ClientData * filePtr);
+EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
+				const char *chanID, int forWriting,
+				int checkUsage, ClientData *filePtr);
 #endif
 #endif /* UNIX */
 #ifdef MAC_OSX_TCL /* MACOSX */
 #ifndef Tcl_GetOpenFile_TCL_DECLARED
 #define Tcl_GetOpenFile_TCL_DECLARED
 /* 167 */
-EXTERN int		Tcl_GetOpenFile (Tcl_Interp * interp,
-				const char * chanID, int forWriting,
-				int checkUsage, ClientData * filePtr);
+EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
+				const char *chanID, int forWriting,
+				int checkUsage, ClientData *filePtr);
 #endif
 #endif /* MACOSX */
 #ifndef Tcl_GetPathType_TCL_DECLARED
 #define Tcl_GetPathType_TCL_DECLARED
 /* 168 */
-EXTERN Tcl_PathType	Tcl_GetPathType (const char * path);
+EXTERN Tcl_PathType	Tcl_GetPathType(const char *path);
 #endif
 #ifndef Tcl_Gets_TCL_DECLARED
 #define Tcl_Gets_TCL_DECLARED
 /* 169 */
-EXTERN int		Tcl_Gets (Tcl_Channel chan, Tcl_DString * dsPtr);
+EXTERN int		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_GetsObj_TCL_DECLARED
 #define Tcl_GetsObj_TCL_DECLARED
 /* 170 */
-EXTERN int		Tcl_GetsObj (Tcl_Channel chan, Tcl_Obj * objPtr);
+EXTERN int		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetServiceMode_TCL_DECLARED
 #define Tcl_GetServiceMode_TCL_DECLARED
 /* 171 */
-EXTERN int		Tcl_GetServiceMode (void);
+EXTERN int		Tcl_GetServiceMode(void);
 #endif
 #ifndef Tcl_GetSlave_TCL_DECLARED
 #define Tcl_GetSlave_TCL_DECLARED
 /* 172 */
-EXTERN Tcl_Interp *	Tcl_GetSlave (Tcl_Interp * interp,
-				const char * slaveName);
+EXTERN Tcl_Interp *	Tcl_GetSlave(Tcl_Interp *interp,
+				const char *slaveName);
 #endif
 #ifndef Tcl_GetStdChannel_TCL_DECLARED
 #define Tcl_GetStdChannel_TCL_DECLARED
 /* 173 */
-EXTERN Tcl_Channel	Tcl_GetStdChannel (int type);
+EXTERN Tcl_Channel	Tcl_GetStdChannel(int type);
 #endif
 #ifndef Tcl_GetStringResult_TCL_DECLARED
 #define Tcl_GetStringResult_TCL_DECLARED
 /* 174 */
-EXTERN CONST84_RETURN char * Tcl_GetStringResult (Tcl_Interp * interp);
+EXTERN CONST84_RETURN char * Tcl_GetStringResult(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_GetVar_TCL_DECLARED
 #define Tcl_GetVar_TCL_DECLARED
 /* 175 */
-EXTERN CONST84_RETURN char * Tcl_GetVar (Tcl_Interp * interp,
-				const char * varName, int flags);
+EXTERN CONST84_RETURN char * Tcl_GetVar(Tcl_Interp *interp,
+				const char *varName, int flags);
 #endif
 #ifndef Tcl_GetVar2_TCL_DECLARED
 #define Tcl_GetVar2_TCL_DECLARED
 /* 176 */
-EXTERN CONST84_RETURN char * Tcl_GetVar2 (Tcl_Interp * interp,
-				const char * part1, const char * part2,
+EXTERN CONST84_RETURN char * Tcl_GetVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
 				int flags);
 #endif
 #ifndef Tcl_GlobalEval_TCL_DECLARED
 #define Tcl_GlobalEval_TCL_DECLARED
 /* 177 */
-EXTERN int		Tcl_GlobalEval (Tcl_Interp * interp,
-				const char * command);
+EXTERN int		Tcl_GlobalEval(Tcl_Interp *interp,
+				const char *command);
 #endif
 #ifndef Tcl_GlobalEvalObj_TCL_DECLARED
 #define Tcl_GlobalEvalObj_TCL_DECLARED
 /* 178 */
-EXTERN int		Tcl_GlobalEvalObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr);
+EXTERN int		Tcl_GlobalEvalObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_HideCommand_TCL_DECLARED
 #define Tcl_HideCommand_TCL_DECLARED
 /* 179 */
-EXTERN int		Tcl_HideCommand (Tcl_Interp * interp,
-				const char * cmdName,
-				const char * hiddenCmdToken);
+EXTERN int		Tcl_HideCommand(Tcl_Interp *interp,
+				const char *cmdName,
+				const char *hiddenCmdToken);
 #endif
 #ifndef Tcl_Init_TCL_DECLARED
 #define Tcl_Init_TCL_DECLARED
 /* 180 */
-EXTERN int		Tcl_Init (Tcl_Interp * interp);
+EXTERN int		Tcl_Init(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_InitHashTable_TCL_DECLARED
 #define Tcl_InitHashTable_TCL_DECLARED
 /* 181 */
-EXTERN void		Tcl_InitHashTable (Tcl_HashTable * tablePtr,
+EXTERN void		Tcl_InitHashTable(Tcl_HashTable *tablePtr,
 				int keyType);
 #endif
 #ifndef Tcl_InputBlocked_TCL_DECLARED
 #define Tcl_InputBlocked_TCL_DECLARED
 /* 182 */
-EXTERN int		Tcl_InputBlocked (Tcl_Channel chan);
+EXTERN int		Tcl_InputBlocked(Tcl_Channel chan);
 #endif
 #ifndef Tcl_InputBuffered_TCL_DECLARED
 #define Tcl_InputBuffered_TCL_DECLARED
 /* 183 */
-EXTERN int		Tcl_InputBuffered (Tcl_Channel chan);
+EXTERN int		Tcl_InputBuffered(Tcl_Channel chan);
 #endif
 #ifndef Tcl_InterpDeleted_TCL_DECLARED
 #define Tcl_InterpDeleted_TCL_DECLARED
 /* 184 */
-EXTERN int		Tcl_InterpDeleted (Tcl_Interp * interp);
+EXTERN int		Tcl_InterpDeleted(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_IsSafe_TCL_DECLARED
 #define Tcl_IsSafe_TCL_DECLARED
 /* 185 */
-EXTERN int		Tcl_IsSafe (Tcl_Interp * interp);
+EXTERN int		Tcl_IsSafe(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_JoinPath_TCL_DECLARED
 #define Tcl_JoinPath_TCL_DECLARED
 /* 186 */
-EXTERN char *		Tcl_JoinPath (int argc, CONST84 char *const * argv,
-				Tcl_DString * resultPtr);
+EXTERN char *		Tcl_JoinPath(int argc, CONST84 char *const *argv,
+				Tcl_DString *resultPtr);
 #endif
 #ifndef Tcl_LinkVar_TCL_DECLARED
 #define Tcl_LinkVar_TCL_DECLARED
 /* 187 */
-EXTERN int		Tcl_LinkVar (Tcl_Interp * interp,
-				const char * varName, char * addr, int type);
+EXTERN int		Tcl_LinkVar(Tcl_Interp *interp, const char *varName,
+				char *addr, int type);
 #endif
 /* Slot 188 is reserved */
 #ifndef Tcl_MakeFileChannel_TCL_DECLARED
 #define Tcl_MakeFileChannel_TCL_DECLARED
 /* 189 */
-EXTERN Tcl_Channel	Tcl_MakeFileChannel (ClientData handle, int mode);
+EXTERN Tcl_Channel	Tcl_MakeFileChannel(ClientData handle, int mode);
 #endif
 #ifndef Tcl_MakeSafe_TCL_DECLARED
 #define Tcl_MakeSafe_TCL_DECLARED
 /* 190 */
-EXTERN int		Tcl_MakeSafe (Tcl_Interp * interp);
+EXTERN int		Tcl_MakeSafe(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_MakeTcpClientChannel_TCL_DECLARED
 #define Tcl_MakeTcpClientChannel_TCL_DECLARED
 /* 191 */
-EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel (ClientData tcpSocket);
+EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel(ClientData tcpSocket);
 #endif
 #ifndef Tcl_Merge_TCL_DECLARED
 #define Tcl_Merge_TCL_DECLARED
 /* 192 */
-EXTERN char *		Tcl_Merge (int argc, CONST84 char *const * argv);
+EXTERN char *		Tcl_Merge(int argc, CONST84 char *const *argv);
 #endif
 #ifndef Tcl_NextHashEntry_TCL_DECLARED
 #define Tcl_NextHashEntry_TCL_DECLARED
 /* 193 */
-EXTERN Tcl_HashEntry *	Tcl_NextHashEntry (Tcl_HashSearch * searchPtr);
+EXTERN Tcl_HashEntry *	Tcl_NextHashEntry(Tcl_HashSearch *searchPtr);
 #endif
 #ifndef Tcl_NotifyChannel_TCL_DECLARED
 #define Tcl_NotifyChannel_TCL_DECLARED
 /* 194 */
-EXTERN void		Tcl_NotifyChannel (Tcl_Channel channel, int mask);
+EXTERN void		Tcl_NotifyChannel(Tcl_Channel channel, int mask);
 #endif
 #ifndef Tcl_ObjGetVar2_TCL_DECLARED
 #define Tcl_ObjGetVar2_TCL_DECLARED
 /* 195 */
-EXTERN Tcl_Obj *	Tcl_ObjGetVar2 (Tcl_Interp * interp,
-				Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr,
-				int flags);
+EXTERN Tcl_Obj *	Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+				Tcl_Obj *part2Ptr, int flags);
 #endif
 #ifndef Tcl_ObjSetVar2_TCL_DECLARED
 #define Tcl_ObjSetVar2_TCL_DECLARED
 /* 196 */
-EXTERN Tcl_Obj *	Tcl_ObjSetVar2 (Tcl_Interp * interp,
-				Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr,
-				Tcl_Obj * newValuePtr, int flags);
+EXTERN Tcl_Obj *	Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+				Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr,
+				int flags);
 #endif
 #ifndef Tcl_OpenCommandChannel_TCL_DECLARED
 #define Tcl_OpenCommandChannel_TCL_DECLARED
 /* 197 */
-EXTERN Tcl_Channel	Tcl_OpenCommandChannel (Tcl_Interp * interp,
-				int argc, CONST84 char ** argv, int flags);
+EXTERN Tcl_Channel	Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc,
+				CONST84 char **argv, int flags);
 #endif
 #ifndef Tcl_OpenFileChannel_TCL_DECLARED
 #define Tcl_OpenFileChannel_TCL_DECLARED
 /* 198 */
-EXTERN Tcl_Channel	Tcl_OpenFileChannel (Tcl_Interp * interp,
-				const char * fileName,
-				const char * modeString, int permissions);
+EXTERN Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
+				const char *fileName, const char *modeString,
+				int permissions);
 #endif
 #ifndef Tcl_OpenTcpClient_TCL_DECLARED
 #define Tcl_OpenTcpClient_TCL_DECLARED
 /* 199 */
-EXTERN Tcl_Channel	Tcl_OpenTcpClient (Tcl_Interp * interp, int port,
-				const char * address, const char * myaddr,
+EXTERN Tcl_Channel	Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
+				const char *address, const char *myaddr,
 				int myport, int async);
 #endif
 #ifndef Tcl_OpenTcpServer_TCL_DECLARED
 #define Tcl_OpenTcpServer_TCL_DECLARED
 /* 200 */
-EXTERN Tcl_Channel	Tcl_OpenTcpServer (Tcl_Interp * interp, int port,
-				const char * host,
-				Tcl_TcpAcceptProc * acceptProc,
+EXTERN Tcl_Channel	Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
+				const char *host,
+				Tcl_TcpAcceptProc *acceptProc,
 				ClientData callbackData);
 #endif
 #ifndef Tcl_Preserve_TCL_DECLARED
 #define Tcl_Preserve_TCL_DECLARED
 /* 201 */
-EXTERN void		Tcl_Preserve (ClientData data);
+EXTERN void		Tcl_Preserve(ClientData data);
 #endif
 #ifndef Tcl_PrintDouble_TCL_DECLARED
 #define Tcl_PrintDouble_TCL_DECLARED
 /* 202 */
-EXTERN void		Tcl_PrintDouble (Tcl_Interp * interp, double value,
-				char * dst);
+EXTERN void		Tcl_PrintDouble(Tcl_Interp *interp, double value,
+				char *dst);
 #endif
 #ifndef Tcl_PutEnv_TCL_DECLARED
 #define Tcl_PutEnv_TCL_DECLARED
 /* 203 */
-EXTERN int		Tcl_PutEnv (const char * assignment);
+EXTERN int		Tcl_PutEnv(const char *assignment);
 #endif
 #ifndef Tcl_PosixError_TCL_DECLARED
 #define Tcl_PosixError_TCL_DECLARED
 /* 204 */
-EXTERN CONST84_RETURN char * Tcl_PosixError (Tcl_Interp * interp);
+EXTERN CONST84_RETURN char * Tcl_PosixError(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_QueueEvent_TCL_DECLARED
 #define Tcl_QueueEvent_TCL_DECLARED
 /* 205 */
-EXTERN void		Tcl_QueueEvent (Tcl_Event * evPtr,
+EXTERN void		Tcl_QueueEvent(Tcl_Event *evPtr,
 				Tcl_QueuePosition position);
 #endif
 #ifndef Tcl_Read_TCL_DECLARED
 #define Tcl_Read_TCL_DECLARED
 /* 206 */
-EXTERN int		Tcl_Read (Tcl_Channel chan, char * bufPtr,
-				int toRead);
+EXTERN int		Tcl_Read(Tcl_Channel chan, char *bufPtr, int toRead);
 #endif
 #ifndef Tcl_ReapDetachedProcs_TCL_DECLARED
 #define Tcl_ReapDetachedProcs_TCL_DECLARED
 /* 207 */
-EXTERN void		Tcl_ReapDetachedProcs (void);
+EXTERN void		Tcl_ReapDetachedProcs(void);
 #endif
 #ifndef Tcl_RecordAndEval_TCL_DECLARED
 #define Tcl_RecordAndEval_TCL_DECLARED
 /* 208 */
-EXTERN int		Tcl_RecordAndEval (Tcl_Interp * interp,
-				const char * cmd, int flags);
+EXTERN int		Tcl_RecordAndEval(Tcl_Interp *interp,
+				const char *cmd, int flags);
 #endif
 #ifndef Tcl_RecordAndEvalObj_TCL_DECLARED
 #define Tcl_RecordAndEvalObj_TCL_DECLARED
 /* 209 */
-EXTERN int		Tcl_RecordAndEvalObj (Tcl_Interp * interp,
-				Tcl_Obj * cmdPtr, int flags);
+EXTERN int		Tcl_RecordAndEvalObj(Tcl_Interp *interp,
+				Tcl_Obj *cmdPtr, int flags);
 #endif
 #ifndef Tcl_RegisterChannel_TCL_DECLARED
 #define Tcl_RegisterChannel_TCL_DECLARED
 /* 210 */
-EXTERN void		Tcl_RegisterChannel (Tcl_Interp * interp,
+EXTERN void		Tcl_RegisterChannel(Tcl_Interp *interp,
 				Tcl_Channel chan);
 #endif
 #ifndef Tcl_RegisterObjType_TCL_DECLARED
 #define Tcl_RegisterObjType_TCL_DECLARED
 /* 211 */
-EXTERN void		Tcl_RegisterObjType (const Tcl_ObjType * typePtr);
+EXTERN void		Tcl_RegisterObjType(const Tcl_ObjType *typePtr);
 #endif
 #ifndef Tcl_RegExpCompile_TCL_DECLARED
 #define Tcl_RegExpCompile_TCL_DECLARED
 /* 212 */
-EXTERN Tcl_RegExp	Tcl_RegExpCompile (Tcl_Interp * interp,
-				const char * pattern);
+EXTERN Tcl_RegExp	Tcl_RegExpCompile(Tcl_Interp *interp,
+				const char *pattern);
 #endif
 #ifndef Tcl_RegExpExec_TCL_DECLARED
 #define Tcl_RegExpExec_TCL_DECLARED
 /* 213 */
-EXTERN int		Tcl_RegExpExec (Tcl_Interp * interp,
-				Tcl_RegExp regexp, const char * text,
-				const char * start);
+EXTERN int		Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
+				const char *text, const char *start);
 #endif
 #ifndef Tcl_RegExpMatch_TCL_DECLARED
 #define Tcl_RegExpMatch_TCL_DECLARED
 /* 214 */
-EXTERN int		Tcl_RegExpMatch (Tcl_Interp * interp,
-				const char * text, const char * pattern);
+EXTERN int		Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
+				const char *pattern);
 #endif
 #ifndef Tcl_RegExpRange_TCL_DECLARED
 #define Tcl_RegExpRange_TCL_DECLARED
 /* 215 */
-EXTERN void		Tcl_RegExpRange (Tcl_RegExp regexp, int index,
-				CONST84 char ** startPtr,
-				CONST84 char ** endPtr);
+EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, int index,
+				CONST84 char **startPtr,
+				CONST84 char **endPtr);
 #endif
 #ifndef Tcl_Release_TCL_DECLARED
 #define Tcl_Release_TCL_DECLARED
 /* 216 */
-EXTERN void		Tcl_Release (ClientData clientData);
+EXTERN void		Tcl_Release(ClientData clientData);
 #endif
 #ifndef Tcl_ResetResult_TCL_DECLARED
 #define Tcl_ResetResult_TCL_DECLARED
 /* 217 */
-EXTERN void		Tcl_ResetResult (Tcl_Interp * interp);
+EXTERN void		Tcl_ResetResult(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_ScanElement_TCL_DECLARED
 #define Tcl_ScanElement_TCL_DECLARED
 /* 218 */
-EXTERN int		Tcl_ScanElement (const char * str, int * flagPtr);
+EXTERN int		Tcl_ScanElement(const char *str, int *flagPtr);
 #endif
 #ifndef Tcl_ScanCountedElement_TCL_DECLARED
 #define Tcl_ScanCountedElement_TCL_DECLARED
 /* 219 */
-EXTERN int		Tcl_ScanCountedElement (const char * str, int length,
-				int * flagPtr);
+EXTERN int		Tcl_ScanCountedElement(const char *str, int length,
+				int *flagPtr);
 #endif
 #ifndef Tcl_SeekOld_TCL_DECLARED
 #define Tcl_SeekOld_TCL_DECLARED
 /* 220 */
-EXTERN int		Tcl_SeekOld (Tcl_Channel chan, int offset, int mode);
+EXTERN int		Tcl_SeekOld(Tcl_Channel chan, int offset, int mode);
 #endif
 #ifndef Tcl_ServiceAll_TCL_DECLARED
 #define Tcl_ServiceAll_TCL_DECLARED
 /* 221 */
-EXTERN int		Tcl_ServiceAll (void);
+EXTERN int		Tcl_ServiceAll(void);
 #endif
 #ifndef Tcl_ServiceEvent_TCL_DECLARED
 #define Tcl_ServiceEvent_TCL_DECLARED
 /* 222 */
-EXTERN int		Tcl_ServiceEvent (int flags);
+EXTERN int		Tcl_ServiceEvent(int flags);
 #endif
 #ifndef Tcl_SetAssocData_TCL_DECLARED
 #define Tcl_SetAssocData_TCL_DECLARED
 /* 223 */
-EXTERN void		Tcl_SetAssocData (Tcl_Interp * interp,
-				const char * name,
-				Tcl_InterpDeleteProc * proc,
+EXTERN void		Tcl_SetAssocData(Tcl_Interp *interp,
+				const char *name, Tcl_InterpDeleteProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_SetChannelBufferSize_TCL_DECLARED
 #define Tcl_SetChannelBufferSize_TCL_DECLARED
 /* 224 */
-EXTERN void		Tcl_SetChannelBufferSize (Tcl_Channel chan, int sz);
+EXTERN void		Tcl_SetChannelBufferSize(Tcl_Channel chan, int sz);
 #endif
 #ifndef Tcl_SetChannelOption_TCL_DECLARED
 #define Tcl_SetChannelOption_TCL_DECLARED
 /* 225 */
-EXTERN int		Tcl_SetChannelOption (Tcl_Interp * interp,
-				Tcl_Channel chan, const char * optionName,
-				const char * newValue);
+EXTERN int		Tcl_SetChannelOption(Tcl_Interp *interp,
+				Tcl_Channel chan, const char *optionName,
+				const char *newValue);
 #endif
 #ifndef Tcl_SetCommandInfo_TCL_DECLARED
 #define Tcl_SetCommandInfo_TCL_DECLARED
 /* 226 */
-EXTERN int		Tcl_SetCommandInfo (Tcl_Interp * interp,
-				const char * cmdName,
-				const Tcl_CmdInfo * infoPtr);
+EXTERN int		Tcl_SetCommandInfo(Tcl_Interp *interp,
+				const char *cmdName,
+				const Tcl_CmdInfo *infoPtr);
 #endif
 #ifndef Tcl_SetErrno_TCL_DECLARED
 #define Tcl_SetErrno_TCL_DECLARED
 /* 227 */
-EXTERN void		Tcl_SetErrno (int err);
+EXTERN void		Tcl_SetErrno(int err);
 #endif
 #ifndef Tcl_SetErrorCode_TCL_DECLARED
 #define Tcl_SetErrorCode_TCL_DECLARED
 /* 228 */
-EXTERN void		Tcl_SetErrorCode (Tcl_Interp * interp, ...);
+EXTERN void		Tcl_SetErrorCode(Tcl_Interp *interp, ...);
 #endif
 #ifndef Tcl_SetMaxBlockTime_TCL_DECLARED
 #define Tcl_SetMaxBlockTime_TCL_DECLARED
 /* 229 */
-EXTERN void		Tcl_SetMaxBlockTime (const Tcl_Time * timePtr);
+EXTERN void		Tcl_SetMaxBlockTime(const Tcl_Time *timePtr);
 #endif
 #ifndef Tcl_SetPanicProc_TCL_DECLARED
 #define Tcl_SetPanicProc_TCL_DECLARED
 /* 230 */
-EXTERN void		Tcl_SetPanicProc (Tcl_PanicProc * panicProc);
+EXTERN void		Tcl_SetPanicProc(Tcl_PanicProc *panicProc);
 #endif
 #ifndef Tcl_SetRecursionLimit_TCL_DECLARED
 #define Tcl_SetRecursionLimit_TCL_DECLARED
 /* 231 */
-EXTERN int		Tcl_SetRecursionLimit (Tcl_Interp * interp,
-				int depth);
+EXTERN int		Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth);
 #endif
 #ifndef Tcl_SetResult_TCL_DECLARED
 #define Tcl_SetResult_TCL_DECLARED
 /* 232 */
-EXTERN void		Tcl_SetResult (Tcl_Interp * interp, char * result,
-				Tcl_FreeProc * freeProc);
+EXTERN void		Tcl_SetResult(Tcl_Interp *interp, char *result,
+				Tcl_FreeProc *freeProc);
 #endif
 #ifndef Tcl_SetServiceMode_TCL_DECLARED
 #define Tcl_SetServiceMode_TCL_DECLARED
 /* 233 */
-EXTERN int		Tcl_SetServiceMode (int mode);
+EXTERN int		Tcl_SetServiceMode(int mode);
 #endif
 #ifndef Tcl_SetObjErrorCode_TCL_DECLARED
 #define Tcl_SetObjErrorCode_TCL_DECLARED
 /* 234 */
-EXTERN void		Tcl_SetObjErrorCode (Tcl_Interp * interp,
-				Tcl_Obj * errorObjPtr);
+EXTERN void		Tcl_SetObjErrorCode(Tcl_Interp *interp,
+				Tcl_Obj *errorObjPtr);
 #endif
 #ifndef Tcl_SetObjResult_TCL_DECLARED
 #define Tcl_SetObjResult_TCL_DECLARED
 /* 235 */
-EXTERN void		Tcl_SetObjResult (Tcl_Interp * interp,
-				Tcl_Obj * resultObjPtr);
+EXTERN void		Tcl_SetObjResult(Tcl_Interp *interp,
+				Tcl_Obj *resultObjPtr);
 #endif
 #ifndef Tcl_SetStdChannel_TCL_DECLARED
 #define Tcl_SetStdChannel_TCL_DECLARED
 /* 236 */
-EXTERN void		Tcl_SetStdChannel (Tcl_Channel channel, int type);
+EXTERN void		Tcl_SetStdChannel(Tcl_Channel channel, int type);
 #endif
 #ifndef Tcl_SetVar_TCL_DECLARED
 #define Tcl_SetVar_TCL_DECLARED
 /* 237 */
-EXTERN CONST84_RETURN char * Tcl_SetVar (Tcl_Interp * interp,
-				const char * varName, const char * newValue,
+EXTERN CONST84_RETURN char * Tcl_SetVar(Tcl_Interp *interp,
+				const char *varName, const char *newValue,
 				int flags);
 #endif
 #ifndef Tcl_SetVar2_TCL_DECLARED
 #define Tcl_SetVar2_TCL_DECLARED
 /* 238 */
-EXTERN CONST84_RETURN char * Tcl_SetVar2 (Tcl_Interp * interp,
-				const char * part1, const char * part2,
-				const char * newValue, int flags);
+EXTERN CONST84_RETURN char * Tcl_SetVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				const char *newValue, int flags);
 #endif
 #ifndef Tcl_SignalId_TCL_DECLARED
 #define Tcl_SignalId_TCL_DECLARED
 /* 239 */
-EXTERN CONST84_RETURN char * Tcl_SignalId (int sig);
+EXTERN CONST84_RETURN char * Tcl_SignalId(int sig);
 #endif
 #ifndef Tcl_SignalMsg_TCL_DECLARED
 #define Tcl_SignalMsg_TCL_DECLARED
 /* 240 */
-EXTERN CONST84_RETURN char * Tcl_SignalMsg (int sig);
+EXTERN CONST84_RETURN char * Tcl_SignalMsg(int sig);
 #endif
 #ifndef Tcl_SourceRCFile_TCL_DECLARED
 #define Tcl_SourceRCFile_TCL_DECLARED
 /* 241 */
-EXTERN void		Tcl_SourceRCFile (Tcl_Interp * interp);
+EXTERN void		Tcl_SourceRCFile(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_SplitList_TCL_DECLARED
 #define Tcl_SplitList_TCL_DECLARED
 /* 242 */
-EXTERN int		Tcl_SplitList (Tcl_Interp * interp,
-				const char * listStr, int * argcPtr,
-				CONST84 char *** argvPtr);
+EXTERN int		Tcl_SplitList(Tcl_Interp *interp,
+				const char *listStr, int *argcPtr,
+				CONST84 char ***argvPtr);
 #endif
 #ifndef Tcl_SplitPath_TCL_DECLARED
 #define Tcl_SplitPath_TCL_DECLARED
 /* 243 */
-EXTERN void		Tcl_SplitPath (const char * path, int * argcPtr,
-				CONST84 char *** argvPtr);
+EXTERN void		Tcl_SplitPath(const char *path, int *argcPtr,
+				CONST84 char ***argvPtr);
 #endif
 #ifndef Tcl_StaticPackage_TCL_DECLARED
 #define Tcl_StaticPackage_TCL_DECLARED
 /* 244 */
-EXTERN void		Tcl_StaticPackage (Tcl_Interp * interp,
-				const char * pkgName,
-				Tcl_PackageInitProc * initProc,
-				Tcl_PackageInitProc * safeInitProc);
+EXTERN void		Tcl_StaticPackage(Tcl_Interp *interp,
+				const char *pkgName,
+				Tcl_PackageInitProc *initProc,
+				Tcl_PackageInitProc *safeInitProc);
 #endif
 #ifndef Tcl_StringMatch_TCL_DECLARED
 #define Tcl_StringMatch_TCL_DECLARED
 /* 245 */
-EXTERN int		Tcl_StringMatch (const char * str,
-				const char * pattern);
+EXTERN int		Tcl_StringMatch(const char *str, const char *pattern);
 #endif
 #ifndef Tcl_TellOld_TCL_DECLARED
 #define Tcl_TellOld_TCL_DECLARED
 /* 246 */
-EXTERN int		Tcl_TellOld (Tcl_Channel chan);
+EXTERN int		Tcl_TellOld(Tcl_Channel chan);
 #endif
 #ifndef Tcl_TraceVar_TCL_DECLARED
 #define Tcl_TraceVar_TCL_DECLARED
 /* 247 */
-EXTERN int		Tcl_TraceVar (Tcl_Interp * interp,
-				const char * varName, int flags,
-				Tcl_VarTraceProc * proc,
+EXTERN int		Tcl_TraceVar(Tcl_Interp *interp, const char *varName,
+				int flags, Tcl_VarTraceProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_TraceVar2_TCL_DECLARED
 #define Tcl_TraceVar2_TCL_DECLARED
 /* 248 */
-EXTERN int		Tcl_TraceVar2 (Tcl_Interp * interp,
-				const char * part1, const char * part2,
-				int flags, Tcl_VarTraceProc * proc,
+EXTERN int		Tcl_TraceVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags,
+				Tcl_VarTraceProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_TranslateFileName_TCL_DECLARED
 #define Tcl_TranslateFileName_TCL_DECLARED
 /* 249 */
-EXTERN char *		Tcl_TranslateFileName (Tcl_Interp * interp,
-				const char * name, Tcl_DString * bufferPtr);
+EXTERN char *		Tcl_TranslateFileName(Tcl_Interp *interp,
+				const char *name, Tcl_DString *bufferPtr);
 #endif
 #ifndef Tcl_Ungets_TCL_DECLARED
 #define Tcl_Ungets_TCL_DECLARED
 /* 250 */
-EXTERN int		Tcl_Ungets (Tcl_Channel chan, const char * str,
+EXTERN int		Tcl_Ungets(Tcl_Channel chan, const char *str,
 				int len, int atHead);
 #endif
 #ifndef Tcl_UnlinkVar_TCL_DECLARED
 #define Tcl_UnlinkVar_TCL_DECLARED
 /* 251 */
-EXTERN void		Tcl_UnlinkVar (Tcl_Interp * interp,
-				const char * varName);
+EXTERN void		Tcl_UnlinkVar(Tcl_Interp *interp,
+				const char *varName);
 #endif
 #ifndef Tcl_UnregisterChannel_TCL_DECLARED
 #define Tcl_UnregisterChannel_TCL_DECLARED
 /* 252 */
-EXTERN int		Tcl_UnregisterChannel (Tcl_Interp * interp,
+EXTERN int		Tcl_UnregisterChannel(Tcl_Interp *interp,
 				Tcl_Channel chan);
 #endif
 #ifndef Tcl_UnsetVar_TCL_DECLARED
 #define Tcl_UnsetVar_TCL_DECLARED
 /* 253 */
-EXTERN int		Tcl_UnsetVar (Tcl_Interp * interp,
-				const char * varName, int flags);
+EXTERN int		Tcl_UnsetVar(Tcl_Interp *interp, const char *varName,
+				int flags);
 #endif
 #ifndef Tcl_UnsetVar2_TCL_DECLARED
 #define Tcl_UnsetVar2_TCL_DECLARED
 /* 254 */
-EXTERN int		Tcl_UnsetVar2 (Tcl_Interp * interp,
-				const char * part1, const char * part2,
-				int flags);
+EXTERN int		Tcl_UnsetVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
 #endif
 #ifndef Tcl_UntraceVar_TCL_DECLARED
 #define Tcl_UntraceVar_TCL_DECLARED
 /* 255 */
-EXTERN void		Tcl_UntraceVar (Tcl_Interp * interp,
-				const char * varName, int flags,
-				Tcl_VarTraceProc * proc,
+EXTERN void		Tcl_UntraceVar(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_VarTraceProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_UntraceVar2_TCL_DECLARED
 #define Tcl_UntraceVar2_TCL_DECLARED
 /* 256 */
-EXTERN void		Tcl_UntraceVar2 (Tcl_Interp * interp,
-				const char * part1, const char * part2,
-				int flags, Tcl_VarTraceProc * proc,
+EXTERN void		Tcl_UntraceVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags, Tcl_VarTraceProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_UpdateLinkedVar_TCL_DECLARED
 #define Tcl_UpdateLinkedVar_TCL_DECLARED
 /* 257 */
-EXTERN void		Tcl_UpdateLinkedVar (Tcl_Interp * interp,
-				const char * varName);
+EXTERN void		Tcl_UpdateLinkedVar(Tcl_Interp *interp,
+				const char *varName);
 #endif
 #ifndef Tcl_UpVar_TCL_DECLARED
 #define Tcl_UpVar_TCL_DECLARED
 /* 258 */
-EXTERN int		Tcl_UpVar (Tcl_Interp * interp,
-				const char * frameName, const char * varName,
-				const char * localName, int flags);
+EXTERN int		Tcl_UpVar(Tcl_Interp *interp, const char *frameName,
+				const char *varName, const char *localName,
+				int flags);
 #endif
 #ifndef Tcl_UpVar2_TCL_DECLARED
 #define Tcl_UpVar2_TCL_DECLARED
 /* 259 */
-EXTERN int		Tcl_UpVar2 (Tcl_Interp * interp,
-				const char * frameName, const char * part1,
-				const char * part2, const char * localName,
-				int flags);
+EXTERN int		Tcl_UpVar2(Tcl_Interp *interp, const char *frameName,
+				const char *part1, const char *part2,
+				const char *localName, int flags);
 #endif
 #ifndef Tcl_VarEval_TCL_DECLARED
 #define Tcl_VarEval_TCL_DECLARED
 /* 260 */
-EXTERN int		Tcl_VarEval (Tcl_Interp * interp, ...);
+EXTERN int		Tcl_VarEval(Tcl_Interp *interp, ...);
 #endif
 #ifndef Tcl_VarTraceInfo_TCL_DECLARED
 #define Tcl_VarTraceInfo_TCL_DECLARED
 /* 261 */
-EXTERN ClientData	Tcl_VarTraceInfo (Tcl_Interp * interp,
-				const char * varName, int flags,
-				Tcl_VarTraceProc * procPtr,
+EXTERN ClientData	Tcl_VarTraceInfo(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_VarTraceProc *procPtr,
 				ClientData prevClientData);
 #endif
 #ifndef Tcl_VarTraceInfo2_TCL_DECLARED
 #define Tcl_VarTraceInfo2_TCL_DECLARED
 /* 262 */
-EXTERN ClientData	Tcl_VarTraceInfo2 (Tcl_Interp * interp,
-				const char * part1, const char * part2,
-				int flags, Tcl_VarTraceProc * procPtr,
+EXTERN ClientData	Tcl_VarTraceInfo2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags, Tcl_VarTraceProc *procPtr,
 				ClientData prevClientData);
 #endif
 #ifndef Tcl_Write_TCL_DECLARED
 #define Tcl_Write_TCL_DECLARED
 /* 263 */
-EXTERN int		Tcl_Write (Tcl_Channel chan, const char * s,
-				int slen);
+EXTERN int		Tcl_Write(Tcl_Channel chan, const char *s, int slen);
 #endif
 #ifndef Tcl_WrongNumArgs_TCL_DECLARED
 #define Tcl_WrongNumArgs_TCL_DECLARED
 /* 264 */
-EXTERN void		Tcl_WrongNumArgs (Tcl_Interp * interp, int objc,
-				Tcl_Obj *const objv[], const char * message);
+EXTERN void		Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[], const char *message);
 #endif
 #ifndef Tcl_DumpActiveMemory_TCL_DECLARED
 #define Tcl_DumpActiveMemory_TCL_DECLARED
 /* 265 */
-EXTERN int		Tcl_DumpActiveMemory (const char * fileName);
+EXTERN int		Tcl_DumpActiveMemory(const char *fileName);
 #endif
 #ifndef Tcl_ValidateAllMemory_TCL_DECLARED
 #define Tcl_ValidateAllMemory_TCL_DECLARED
 /* 266 */
-EXTERN void		Tcl_ValidateAllMemory (const char * file, int line);
+EXTERN void		Tcl_ValidateAllMemory(const char *file, int line);
 #endif
 #ifndef Tcl_AppendResultVA_TCL_DECLARED
 #define Tcl_AppendResultVA_TCL_DECLARED
 /* 267 */
-EXTERN void		Tcl_AppendResultVA (Tcl_Interp * interp,
+EXTERN void		Tcl_AppendResultVA(Tcl_Interp *interp,
 				va_list argList);
 #endif
 #ifndef Tcl_AppendStringsToObjVA_TCL_DECLARED
 #define Tcl_AppendStringsToObjVA_TCL_DECLARED
 /* 268 */
-EXTERN void		Tcl_AppendStringsToObjVA (Tcl_Obj * objPtr,
+EXTERN void		Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr,
 				va_list argList);
 #endif
 #ifndef Tcl_HashStats_TCL_DECLARED
 #define Tcl_HashStats_TCL_DECLARED
 /* 269 */
-EXTERN char *		Tcl_HashStats (Tcl_HashTable * tablePtr);
+EXTERN char *		Tcl_HashStats(Tcl_HashTable *tablePtr);
 #endif
 #ifndef Tcl_ParseVar_TCL_DECLARED
 #define Tcl_ParseVar_TCL_DECLARED
 /* 270 */
-EXTERN CONST84_RETURN char * Tcl_ParseVar (Tcl_Interp * interp,
-				const char * start, CONST84 char ** termPtr);
+EXTERN CONST84_RETURN char * Tcl_ParseVar(Tcl_Interp *interp,
+				const char *start, CONST84 char **termPtr);
 #endif
 #ifndef Tcl_PkgPresent_TCL_DECLARED
 #define Tcl_PkgPresent_TCL_DECLARED
 /* 271 */
-EXTERN CONST84_RETURN char * Tcl_PkgPresent (Tcl_Interp * interp,
-				const char * name, const char * version,
+EXTERN CONST84_RETURN char * Tcl_PkgPresent(Tcl_Interp *interp,
+				const char *name, const char *version,
 				int exact);
 #endif
 #ifndef Tcl_PkgPresentEx_TCL_DECLARED
 #define Tcl_PkgPresentEx_TCL_DECLARED
 /* 272 */
-EXTERN CONST84_RETURN char * Tcl_PkgPresentEx (Tcl_Interp * interp,
-				const char * name, const char * version,
-				int exact, ClientData * clientDataPtr);
+EXTERN CONST84_RETURN char * Tcl_PkgPresentEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact, ClientData *clientDataPtr);
 #endif
 #ifndef Tcl_PkgProvide_TCL_DECLARED
 #define Tcl_PkgProvide_TCL_DECLARED
 /* 273 */
-EXTERN int		Tcl_PkgProvide (Tcl_Interp * interp,
-				const char * name, const char * version);
+EXTERN int		Tcl_PkgProvide(Tcl_Interp *interp, const char *name,
+				const char *version);
 #endif
 #ifndef Tcl_PkgRequire_TCL_DECLARED
 #define Tcl_PkgRequire_TCL_DECLARED
 /* 274 */
-EXTERN CONST84_RETURN char * Tcl_PkgRequire (Tcl_Interp * interp,
-				const char * name, const char * version,
+EXTERN CONST84_RETURN char * Tcl_PkgRequire(Tcl_Interp *interp,
+				const char *name, const char *version,
 				int exact);
 #endif
 #ifndef Tcl_SetErrorCodeVA_TCL_DECLARED
 #define Tcl_SetErrorCodeVA_TCL_DECLARED
 /* 275 */
-EXTERN void		Tcl_SetErrorCodeVA (Tcl_Interp * interp,
+EXTERN void		Tcl_SetErrorCodeVA(Tcl_Interp *interp,
 				va_list argList);
 #endif
 #ifndef Tcl_VarEvalVA_TCL_DECLARED
 #define Tcl_VarEvalVA_TCL_DECLARED
 /* 276 */
-EXTERN int		Tcl_VarEvalVA (Tcl_Interp * interp, va_list argList);
+EXTERN int		Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList);
 #endif
 #ifndef Tcl_WaitPid_TCL_DECLARED
 #define Tcl_WaitPid_TCL_DECLARED
 /* 277 */
-EXTERN Tcl_Pid		Tcl_WaitPid (Tcl_Pid pid, int * statPtr, int options);
+EXTERN Tcl_Pid		Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options);
 #endif
 #ifndef Tcl_PanicVA_TCL_DECLARED
 #define Tcl_PanicVA_TCL_DECLARED
 /* 278 */
-EXTERN void		Tcl_PanicVA (const char * format, va_list argList);
+EXTERN void		Tcl_PanicVA(const char *format, va_list argList);
 #endif
 #ifndef Tcl_GetVersion_TCL_DECLARED
 #define Tcl_GetVersion_TCL_DECLARED
 /* 279 */
-EXTERN void		Tcl_GetVersion (int * major, int * minor,
-				int * patchLevel, int * type);
+EXTERN void		Tcl_GetVersion(int *major, int *minor,
+				int *patchLevel, int *type);
 #endif
 #ifndef Tcl_InitMemory_TCL_DECLARED
 #define Tcl_InitMemory_TCL_DECLARED
 /* 280 */
-EXTERN void		Tcl_InitMemory (Tcl_Interp * interp);
+EXTERN void		Tcl_InitMemory(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_StackChannel_TCL_DECLARED
 #define Tcl_StackChannel_TCL_DECLARED
 /* 281 */
-EXTERN Tcl_Channel	Tcl_StackChannel (Tcl_Interp * interp,
-				const Tcl_ChannelType * typePtr,
+EXTERN Tcl_Channel	Tcl_StackChannel(Tcl_Interp *interp,
+				const Tcl_ChannelType *typePtr,
 				ClientData instanceData, int mask,
 				Tcl_Channel prevChan);
 #endif
 #ifndef Tcl_UnstackChannel_TCL_DECLARED
 #define Tcl_UnstackChannel_TCL_DECLARED
 /* 282 */
-EXTERN int		Tcl_UnstackChannel (Tcl_Interp * interp,
+EXTERN int		Tcl_UnstackChannel(Tcl_Interp *interp,
 				Tcl_Channel chan);
 #endif
 #ifndef Tcl_GetStackedChannel_TCL_DECLARED
 #define Tcl_GetStackedChannel_TCL_DECLARED
 /* 283 */
-EXTERN Tcl_Channel	Tcl_GetStackedChannel (Tcl_Channel chan);
+EXTERN Tcl_Channel	Tcl_GetStackedChannel(Tcl_Channel chan);
 #endif
 #ifndef Tcl_SetMainLoop_TCL_DECLARED
 #define Tcl_SetMainLoop_TCL_DECLARED
 /* 284 */
-EXTERN void		Tcl_SetMainLoop (Tcl_MainLoopProc * proc);
+EXTERN void		Tcl_SetMainLoop(Tcl_MainLoopProc *proc);
 #endif
 /* Slot 285 is reserved */
 #ifndef Tcl_AppendObjToObj_TCL_DECLARED
 #define Tcl_AppendObjToObj_TCL_DECLARED
 /* 286 */
-EXTERN void		Tcl_AppendObjToObj (Tcl_Obj * objPtr,
-				Tcl_Obj * appendObjPtr);
+EXTERN void		Tcl_AppendObjToObj(Tcl_Obj *objPtr,
+				Tcl_Obj *appendObjPtr);
 #endif
 #ifndef Tcl_CreateEncoding_TCL_DECLARED
 #define Tcl_CreateEncoding_TCL_DECLARED
 /* 287 */
-EXTERN Tcl_Encoding	Tcl_CreateEncoding (const Tcl_EncodingType * typePtr);
+EXTERN Tcl_Encoding	Tcl_CreateEncoding(const Tcl_EncodingType *typePtr);
 #endif
 #ifndef Tcl_CreateThreadExitHandler_TCL_DECLARED
 #define Tcl_CreateThreadExitHandler_TCL_DECLARED
 /* 288 */
-EXTERN void		Tcl_CreateThreadExitHandler (Tcl_ExitProc * proc,
+EXTERN void		Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DeleteThreadExitHandler_TCL_DECLARED
 #define Tcl_DeleteThreadExitHandler_TCL_DECLARED
 /* 289 */
-EXTERN void		Tcl_DeleteThreadExitHandler (Tcl_ExitProc * proc,
+EXTERN void		Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_DiscardResult_TCL_DECLARED
 #define Tcl_DiscardResult_TCL_DECLARED
 /* 290 */
-EXTERN void		Tcl_DiscardResult (Tcl_SavedResult * statePtr);
+EXTERN void		Tcl_DiscardResult(Tcl_SavedResult *statePtr);
 #endif
 #ifndef Tcl_EvalEx_TCL_DECLARED
 #define Tcl_EvalEx_TCL_DECLARED
 /* 291 */
-EXTERN int		Tcl_EvalEx (Tcl_Interp * interp, const char * script,
+EXTERN int		Tcl_EvalEx(Tcl_Interp *interp, const char *script,
 				int numBytes, int flags);
 #endif
 #ifndef Tcl_EvalObjv_TCL_DECLARED
 #define Tcl_EvalObjv_TCL_DECLARED
 /* 292 */
-EXTERN int		Tcl_EvalObjv (Tcl_Interp * interp, int objc,
+EXTERN int		Tcl_EvalObjv(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], int flags);
 #endif
 #ifndef Tcl_EvalObjEx_TCL_DECLARED
 #define Tcl_EvalObjEx_TCL_DECLARED
 /* 293 */
-EXTERN int		Tcl_EvalObjEx (Tcl_Interp * interp, Tcl_Obj * objPtr,
+EXTERN int		Tcl_EvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags);
 #endif
 #ifndef Tcl_ExitThread_TCL_DECLARED
 #define Tcl_ExitThread_TCL_DECLARED
 /* 294 */
-EXTERN void		Tcl_ExitThread (int status);
+EXTERN void		Tcl_ExitThread(int status);
 #endif
 #ifndef Tcl_ExternalToUtf_TCL_DECLARED
 #define Tcl_ExternalToUtf_TCL_DECLARED
 /* 295 */
-EXTERN int		Tcl_ExternalToUtf (Tcl_Interp * interp,
-				Tcl_Encoding encoding, const char * src,
+EXTERN int		Tcl_ExternalToUtf(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
 				int srcLen, int flags,
-				Tcl_EncodingState * statePtr, char * dst,
-				int dstLen, int * srcReadPtr,
-				int * dstWrotePtr, int * dstCharsPtr);
+				Tcl_EncodingState *statePtr, char *dst,
+				int dstLen, int *srcReadPtr,
+				int *dstWrotePtr, int *dstCharsPtr);
 #endif
 #ifndef Tcl_ExternalToUtfDString_TCL_DECLARED
 #define Tcl_ExternalToUtfDString_TCL_DECLARED
 /* 296 */
-EXTERN char *		Tcl_ExternalToUtfDString (Tcl_Encoding encoding,
-				const char * src, int srcLen,
-				Tcl_DString * dsPtr);
+EXTERN char *		Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
+				const char *src, int srcLen,
+				Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_FinalizeThread_TCL_DECLARED
 #define Tcl_FinalizeThread_TCL_DECLARED
 /* 297 */
-EXTERN void		Tcl_FinalizeThread (void);
+EXTERN void		Tcl_FinalizeThread(void);
 #endif
 #ifndef Tcl_FinalizeNotifier_TCL_DECLARED
 #define Tcl_FinalizeNotifier_TCL_DECLARED
 /* 298 */
-EXTERN void		Tcl_FinalizeNotifier (ClientData clientData);
+EXTERN void		Tcl_FinalizeNotifier(ClientData clientData);
 #endif
 #ifndef Tcl_FreeEncoding_TCL_DECLARED
 #define Tcl_FreeEncoding_TCL_DECLARED
 /* 299 */
-EXTERN void		Tcl_FreeEncoding (Tcl_Encoding encoding);
+EXTERN void		Tcl_FreeEncoding(Tcl_Encoding encoding);
 #endif
 #ifndef Tcl_GetCurrentThread_TCL_DECLARED
 #define Tcl_GetCurrentThread_TCL_DECLARED
 /* 300 */
-EXTERN Tcl_ThreadId	Tcl_GetCurrentThread (void);
+EXTERN Tcl_ThreadId	Tcl_GetCurrentThread(void);
 #endif
 #ifndef Tcl_GetEncoding_TCL_DECLARED
 #define Tcl_GetEncoding_TCL_DECLARED
 /* 301 */
-EXTERN Tcl_Encoding	Tcl_GetEncoding (Tcl_Interp * interp,
-				const char * name);
+EXTERN Tcl_Encoding	Tcl_GetEncoding(Tcl_Interp *interp, const char *name);
 #endif
 #ifndef Tcl_GetEncodingName_TCL_DECLARED
 #define Tcl_GetEncodingName_TCL_DECLARED
 /* 302 */
-EXTERN CONST84_RETURN char * Tcl_GetEncodingName (Tcl_Encoding encoding);
+EXTERN CONST84_RETURN char * Tcl_GetEncodingName(Tcl_Encoding encoding);
 #endif
 #ifndef Tcl_GetEncodingNames_TCL_DECLARED
 #define Tcl_GetEncodingNames_TCL_DECLARED
 /* 303 */
-EXTERN void		Tcl_GetEncodingNames (Tcl_Interp * interp);
+EXTERN void		Tcl_GetEncodingNames(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_GetIndexFromObjStruct_TCL_DECLARED
 #define Tcl_GetIndexFromObjStruct_TCL_DECLARED
 /* 304 */
-EXTERN int		Tcl_GetIndexFromObjStruct (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, const void * tablePtr,
-				int offset, const char * msg, int flags,
-				int * indexPtr);
+EXTERN int		Tcl_GetIndexFromObjStruct(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const void *tablePtr,
+				int offset, const char *msg, int flags,
+				int *indexPtr);
 #endif
 #ifndef Tcl_GetThreadData_TCL_DECLARED
 #define Tcl_GetThreadData_TCL_DECLARED
 /* 305 */
-EXTERN void *		Tcl_GetThreadData (Tcl_ThreadDataKey * keyPtr,
+EXTERN void *		Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr,
 				int size);
 #endif
 #ifndef Tcl_GetVar2Ex_TCL_DECLARED
 #define Tcl_GetVar2Ex_TCL_DECLARED
 /* 306 */
-EXTERN Tcl_Obj *	Tcl_GetVar2Ex (Tcl_Interp * interp,
-				const char * part1, const char * part2,
-				int flags);
+EXTERN Tcl_Obj *	Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
 #endif
 #ifndef Tcl_InitNotifier_TCL_DECLARED
 #define Tcl_InitNotifier_TCL_DECLARED
 /* 307 */
-EXTERN ClientData	Tcl_InitNotifier (void);
+EXTERN ClientData	Tcl_InitNotifier(void);
 #endif
 #ifndef Tcl_MutexLock_TCL_DECLARED
 #define Tcl_MutexLock_TCL_DECLARED
 /* 308 */
-EXTERN void		Tcl_MutexLock (Tcl_Mutex * mutexPtr);
+EXTERN void		Tcl_MutexLock(Tcl_Mutex *mutexPtr);
 #endif
 #ifndef Tcl_MutexUnlock_TCL_DECLARED
 #define Tcl_MutexUnlock_TCL_DECLARED
 /* 309 */
-EXTERN void		Tcl_MutexUnlock (Tcl_Mutex * mutexPtr);
+EXTERN void		Tcl_MutexUnlock(Tcl_Mutex *mutexPtr);
 #endif
 #ifndef Tcl_ConditionNotify_TCL_DECLARED
 #define Tcl_ConditionNotify_TCL_DECLARED
 /* 310 */
-EXTERN void		Tcl_ConditionNotify (Tcl_Condition * condPtr);
+EXTERN void		Tcl_ConditionNotify(Tcl_Condition *condPtr);
 #endif
 #ifndef Tcl_ConditionWait_TCL_DECLARED
 #define Tcl_ConditionWait_TCL_DECLARED
 /* 311 */
-EXTERN void		Tcl_ConditionWait (Tcl_Condition * condPtr,
-				Tcl_Mutex * mutexPtr,
-				const Tcl_Time * timePtr);
+EXTERN void		Tcl_ConditionWait(Tcl_Condition *condPtr,
+				Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr);
 #endif
 #ifndef Tcl_NumUtfChars_TCL_DECLARED
 #define Tcl_NumUtfChars_TCL_DECLARED
 /* 312 */
-EXTERN int		Tcl_NumUtfChars (const char * src, int length);
+EXTERN int		Tcl_NumUtfChars(const char *src, int length);
 #endif
 #ifndef Tcl_ReadChars_TCL_DECLARED
 #define Tcl_ReadChars_TCL_DECLARED
 /* 313 */
-EXTERN int		Tcl_ReadChars (Tcl_Channel channel, Tcl_Obj * objPtr,
+EXTERN int		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
 				int charsToRead, int appendFlag);
 #endif
 #ifndef Tcl_RestoreResult_TCL_DECLARED
 #define Tcl_RestoreResult_TCL_DECLARED
 /* 314 */
-EXTERN void		Tcl_RestoreResult (Tcl_Interp * interp,
-				Tcl_SavedResult * statePtr);
+EXTERN void		Tcl_RestoreResult(Tcl_Interp *interp,
+				Tcl_SavedResult *statePtr);
 #endif
 #ifndef Tcl_SaveResult_TCL_DECLARED
 #define Tcl_SaveResult_TCL_DECLARED
 /* 315 */
-EXTERN void		Tcl_SaveResult (Tcl_Interp * interp,
-				Tcl_SavedResult * statePtr);
+EXTERN void		Tcl_SaveResult(Tcl_Interp *interp,
+				Tcl_SavedResult *statePtr);
 #endif
 #ifndef Tcl_SetSystemEncoding_TCL_DECLARED
 #define Tcl_SetSystemEncoding_TCL_DECLARED
 /* 316 */
-EXTERN int		Tcl_SetSystemEncoding (Tcl_Interp * interp,
-				const char * name);
+EXTERN int		Tcl_SetSystemEncoding(Tcl_Interp *interp,
+				const char *name);
 #endif
 #ifndef Tcl_SetVar2Ex_TCL_DECLARED
 #define Tcl_SetVar2Ex_TCL_DECLARED
 /* 317 */
-EXTERN Tcl_Obj *	Tcl_SetVar2Ex (Tcl_Interp * interp,
-				const char * part1, const char * part2,
-				Tcl_Obj * newValuePtr, int flags);
+EXTERN Tcl_Obj *	Tcl_SetVar2Ex(Tcl_Interp *interp, const char *part1,
+				const char *part2, Tcl_Obj *newValuePtr,
+				int flags);
 #endif
 #ifndef Tcl_ThreadAlert_TCL_DECLARED
 #define Tcl_ThreadAlert_TCL_DECLARED
 /* 318 */
-EXTERN void		Tcl_ThreadAlert (Tcl_ThreadId threadId);
+EXTERN void		Tcl_ThreadAlert(Tcl_ThreadId threadId);
 #endif
 #ifndef Tcl_ThreadQueueEvent_TCL_DECLARED
 #define Tcl_ThreadQueueEvent_TCL_DECLARED
 /* 319 */
-EXTERN void		Tcl_ThreadQueueEvent (Tcl_ThreadId threadId,
-				Tcl_Event * evPtr,
-				Tcl_QueuePosition position);
+EXTERN void		Tcl_ThreadQueueEvent(Tcl_ThreadId threadId,
+				Tcl_Event *evPtr, Tcl_QueuePosition position);
 #endif
 #ifndef Tcl_UniCharAtIndex_TCL_DECLARED
 #define Tcl_UniCharAtIndex_TCL_DECLARED
 /* 320 */
-EXTERN Tcl_UniChar	Tcl_UniCharAtIndex (const char * src, int index);
+EXTERN Tcl_UniChar	Tcl_UniCharAtIndex(const char *src, int index);
 #endif
 #ifndef Tcl_UniCharToLower_TCL_DECLARED
 #define Tcl_UniCharToLower_TCL_DECLARED
 /* 321 */
-EXTERN Tcl_UniChar	Tcl_UniCharToLower (int ch);
+EXTERN Tcl_UniChar	Tcl_UniCharToLower(int ch);
 #endif
 #ifndef Tcl_UniCharToTitle_TCL_DECLARED
 #define Tcl_UniCharToTitle_TCL_DECLARED
 /* 322 */
-EXTERN Tcl_UniChar	Tcl_UniCharToTitle (int ch);
+EXTERN Tcl_UniChar	Tcl_UniCharToTitle(int ch);
 #endif
 #ifndef Tcl_UniCharToUpper_TCL_DECLARED
 #define Tcl_UniCharToUpper_TCL_DECLARED
 /* 323 */
-EXTERN Tcl_UniChar	Tcl_UniCharToUpper (int ch);
+EXTERN Tcl_UniChar	Tcl_UniCharToUpper(int ch);
 #endif
 #ifndef Tcl_UniCharToUtf_TCL_DECLARED
 #define Tcl_UniCharToUtf_TCL_DECLARED
 /* 324 */
-EXTERN int		Tcl_UniCharToUtf (int ch, char * buf);
+EXTERN int		Tcl_UniCharToUtf(int ch, char *buf);
 #endif
 #ifndef Tcl_UtfAtIndex_TCL_DECLARED
 #define Tcl_UtfAtIndex_TCL_DECLARED
 /* 325 */
-EXTERN CONST84_RETURN char * Tcl_UtfAtIndex (const char * src, int index);
+EXTERN CONST84_RETURN char * Tcl_UtfAtIndex(const char *src, int index);
 #endif
 #ifndef Tcl_UtfCharComplete_TCL_DECLARED
 #define Tcl_UtfCharComplete_TCL_DECLARED
 /* 326 */
-EXTERN int		Tcl_UtfCharComplete (const char * src, int length);
+EXTERN int		Tcl_UtfCharComplete(const char *src, int length);
 #endif
 #ifndef Tcl_UtfBackslash_TCL_DECLARED
 #define Tcl_UtfBackslash_TCL_DECLARED
 /* 327 */
-EXTERN int		Tcl_UtfBackslash (const char * src, int * readPtr,
-				char * dst);
+EXTERN int		Tcl_UtfBackslash(const char *src, int *readPtr,
+				char *dst);
 #endif
 #ifndef Tcl_UtfFindFirst_TCL_DECLARED
 #define Tcl_UtfFindFirst_TCL_DECLARED
 /* 328 */
-EXTERN CONST84_RETURN char * Tcl_UtfFindFirst (const char * src, int ch);
+EXTERN CONST84_RETURN char * Tcl_UtfFindFirst(const char *src, int ch);
 #endif
 #ifndef Tcl_UtfFindLast_TCL_DECLARED
 #define Tcl_UtfFindLast_TCL_DECLARED
 /* 329 */
-EXTERN CONST84_RETURN char * Tcl_UtfFindLast (const char * src, int ch);
+EXTERN CONST84_RETURN char * Tcl_UtfFindLast(const char *src, int ch);
 #endif
 #ifndef Tcl_UtfNext_TCL_DECLARED
 #define Tcl_UtfNext_TCL_DECLARED
 /* 330 */
-EXTERN CONST84_RETURN char * Tcl_UtfNext (const char * src);
+EXTERN CONST84_RETURN char * Tcl_UtfNext(const char *src);
 #endif
 #ifndef Tcl_UtfPrev_TCL_DECLARED
 #define Tcl_UtfPrev_TCL_DECLARED
 /* 331 */
-EXTERN CONST84_RETURN char * Tcl_UtfPrev (const char * src,
-				const char * start);
+EXTERN CONST84_RETURN char * Tcl_UtfPrev(const char *src, const char *start);
 #endif
 #ifndef Tcl_UtfToExternal_TCL_DECLARED
 #define Tcl_UtfToExternal_TCL_DECLARED
 /* 332 */
-EXTERN int		Tcl_UtfToExternal (Tcl_Interp * interp,
-				Tcl_Encoding encoding, const char * src,
+EXTERN int		Tcl_UtfToExternal(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
 				int srcLen, int flags,
-				Tcl_EncodingState * statePtr, char * dst,
-				int dstLen, int * srcReadPtr,
-				int * dstWrotePtr, int * dstCharsPtr);
+				Tcl_EncodingState *statePtr, char *dst,
+				int dstLen, int *srcReadPtr,
+				int *dstWrotePtr, int *dstCharsPtr);
 #endif
 #ifndef Tcl_UtfToExternalDString_TCL_DECLARED
 #define Tcl_UtfToExternalDString_TCL_DECLARED
 /* 333 */
-EXTERN char *		Tcl_UtfToExternalDString (Tcl_Encoding encoding,
-				const char * src, int srcLen,
-				Tcl_DString * dsPtr);
+EXTERN char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
+				const char *src, int srcLen,
+				Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_UtfToLower_TCL_DECLARED
 #define Tcl_UtfToLower_TCL_DECLARED
 /* 334 */
-EXTERN int		Tcl_UtfToLower (char * src);
+EXTERN int		Tcl_UtfToLower(char *src);
 #endif
 #ifndef Tcl_UtfToTitle_TCL_DECLARED
 #define Tcl_UtfToTitle_TCL_DECLARED
 /* 335 */
-EXTERN int		Tcl_UtfToTitle (char * src);
+EXTERN int		Tcl_UtfToTitle(char *src);
 #endif
 #ifndef Tcl_UtfToUniChar_TCL_DECLARED
 #define Tcl_UtfToUniChar_TCL_DECLARED
 /* 336 */
-EXTERN int		Tcl_UtfToUniChar (const char * src,
-				Tcl_UniChar * chPtr);
+EXTERN int		Tcl_UtfToUniChar(const char *src, Tcl_UniChar *chPtr);
 #endif
 #ifndef Tcl_UtfToUpper_TCL_DECLARED
 #define Tcl_UtfToUpper_TCL_DECLARED
 /* 337 */
-EXTERN int		Tcl_UtfToUpper (char * src);
+EXTERN int		Tcl_UtfToUpper(char *src);
 #endif
 #ifndef Tcl_WriteChars_TCL_DECLARED
 #define Tcl_WriteChars_TCL_DECLARED
 /* 338 */
-EXTERN int		Tcl_WriteChars (Tcl_Channel chan, const char * src,
+EXTERN int		Tcl_WriteChars(Tcl_Channel chan, const char *src,
 				int srcLen);
 #endif
 #ifndef Tcl_WriteObj_TCL_DECLARED
 #define Tcl_WriteObj_TCL_DECLARED
 /* 339 */
-EXTERN int		Tcl_WriteObj (Tcl_Channel chan, Tcl_Obj * objPtr);
+EXTERN int		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetString_TCL_DECLARED
 #define Tcl_GetString_TCL_DECLARED
 /* 340 */
-EXTERN char *		Tcl_GetString (Tcl_Obj * objPtr);
+EXTERN char *		Tcl_GetString(Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetDefaultEncodingDir_TCL_DECLARED
 #define Tcl_GetDefaultEncodingDir_TCL_DECLARED
 /* 341 */
-EXTERN CONST84_RETURN char * Tcl_GetDefaultEncodingDir (void);
+EXTERN CONST84_RETURN char * Tcl_GetDefaultEncodingDir(void);
 #endif
 #ifndef Tcl_SetDefaultEncodingDir_TCL_DECLARED
 #define Tcl_SetDefaultEncodingDir_TCL_DECLARED
 /* 342 */
-EXTERN void		Tcl_SetDefaultEncodingDir (const char * path);
+EXTERN void		Tcl_SetDefaultEncodingDir(const char *path);
 #endif
 #ifndef Tcl_AlertNotifier_TCL_DECLARED
 #define Tcl_AlertNotifier_TCL_DECLARED
 /* 343 */
-EXTERN void		Tcl_AlertNotifier (ClientData clientData);
+EXTERN void		Tcl_AlertNotifier(ClientData clientData);
 #endif
 #ifndef Tcl_ServiceModeHook_TCL_DECLARED
 #define Tcl_ServiceModeHook_TCL_DECLARED
 /* 344 */
-EXTERN void		Tcl_ServiceModeHook (int mode);
+EXTERN void		Tcl_ServiceModeHook(int mode);
 #endif
 #ifndef Tcl_UniCharIsAlnum_TCL_DECLARED
 #define Tcl_UniCharIsAlnum_TCL_DECLARED
 /* 345 */
-EXTERN int		Tcl_UniCharIsAlnum (int ch);
+EXTERN int		Tcl_UniCharIsAlnum(int ch);
 #endif
 #ifndef Tcl_UniCharIsAlpha_TCL_DECLARED
 #define Tcl_UniCharIsAlpha_TCL_DECLARED
 /* 346 */
-EXTERN int		Tcl_UniCharIsAlpha (int ch);
+EXTERN int		Tcl_UniCharIsAlpha(int ch);
 #endif
 #ifndef Tcl_UniCharIsDigit_TCL_DECLARED
 #define Tcl_UniCharIsDigit_TCL_DECLARED
 /* 347 */
-EXTERN int		Tcl_UniCharIsDigit (int ch);
+EXTERN int		Tcl_UniCharIsDigit(int ch);
 #endif
 #ifndef Tcl_UniCharIsLower_TCL_DECLARED
 #define Tcl_UniCharIsLower_TCL_DECLARED
 /* 348 */
-EXTERN int		Tcl_UniCharIsLower (int ch);
+EXTERN int		Tcl_UniCharIsLower(int ch);
 #endif
 #ifndef Tcl_UniCharIsSpace_TCL_DECLARED
 #define Tcl_UniCharIsSpace_TCL_DECLARED
 /* 349 */
-EXTERN int		Tcl_UniCharIsSpace (int ch);
+EXTERN int		Tcl_UniCharIsSpace(int ch);
 #endif
 #ifndef Tcl_UniCharIsUpper_TCL_DECLARED
 #define Tcl_UniCharIsUpper_TCL_DECLARED
 /* 350 */
-EXTERN int		Tcl_UniCharIsUpper (int ch);
+EXTERN int		Tcl_UniCharIsUpper(int ch);
 #endif
 #ifndef Tcl_UniCharIsWordChar_TCL_DECLARED
 #define Tcl_UniCharIsWordChar_TCL_DECLARED
 /* 351 */
-EXTERN int		Tcl_UniCharIsWordChar (int ch);
+EXTERN int		Tcl_UniCharIsWordChar(int ch);
 #endif
 #ifndef Tcl_UniCharLen_TCL_DECLARED
 #define Tcl_UniCharLen_TCL_DECLARED
 /* 352 */
-EXTERN int		Tcl_UniCharLen (const Tcl_UniChar * uniStr);
+EXTERN int		Tcl_UniCharLen(const Tcl_UniChar *uniStr);
 #endif
 #ifndef Tcl_UniCharNcmp_TCL_DECLARED
 #define Tcl_UniCharNcmp_TCL_DECLARED
 /* 353 */
-EXTERN int		Tcl_UniCharNcmp (const Tcl_UniChar * ucs,
-				const Tcl_UniChar * uct,
+EXTERN int		Tcl_UniCharNcmp(const Tcl_UniChar *ucs,
+				const Tcl_UniChar *uct,
 				unsigned long numChars);
 #endif
 #ifndef Tcl_UniCharToUtfDString_TCL_DECLARED
 #define Tcl_UniCharToUtfDString_TCL_DECLARED
 /* 354 */
-EXTERN char *		Tcl_UniCharToUtfDString (const Tcl_UniChar * uniStr,
-				int uniLength, Tcl_DString * dsPtr);
+EXTERN char *		Tcl_UniCharToUtfDString(const Tcl_UniChar *uniStr,
+				int uniLength, Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_UtfToUniCharDString_TCL_DECLARED
 #define Tcl_UtfToUniCharDString_TCL_DECLARED
 /* 355 */
-EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString (const char * src,
-				int length, Tcl_DString * dsPtr);
+EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString(const char *src, int length,
+				Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_GetRegExpFromObj_TCL_DECLARED
 #define Tcl_GetRegExpFromObj_TCL_DECLARED
 /* 356 */
-EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj (Tcl_Interp * interp,
-				Tcl_Obj * patObj, int flags);
+EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp,
+				Tcl_Obj *patObj, int flags);
 #endif
 #ifndef Tcl_EvalTokens_TCL_DECLARED
 #define Tcl_EvalTokens_TCL_DECLARED
 /* 357 */
-EXTERN Tcl_Obj *	Tcl_EvalTokens (Tcl_Interp * interp,
-				Tcl_Token * tokenPtr, int count);
+EXTERN Tcl_Obj *	Tcl_EvalTokens(Tcl_Interp *interp,
+				Tcl_Token *tokenPtr, int count);
 #endif
 #ifndef Tcl_FreeParse_TCL_DECLARED
 #define Tcl_FreeParse_TCL_DECLARED
 /* 358 */
-EXTERN void		Tcl_FreeParse (Tcl_Parse * parsePtr);
+EXTERN void		Tcl_FreeParse(Tcl_Parse *parsePtr);
 #endif
 #ifndef Tcl_LogCommandInfo_TCL_DECLARED
 #define Tcl_LogCommandInfo_TCL_DECLARED
 /* 359 */
-EXTERN void		Tcl_LogCommandInfo (Tcl_Interp * interp,
-				const char * script, const char * command,
+EXTERN void		Tcl_LogCommandInfo(Tcl_Interp *interp,
+				const char *script, const char *command,
 				int length);
 #endif
 #ifndef Tcl_ParseBraces_TCL_DECLARED
 #define Tcl_ParseBraces_TCL_DECLARED
 /* 360 */
-EXTERN int		Tcl_ParseBraces (Tcl_Interp * interp,
-				const char * start, int numBytes,
-				Tcl_Parse * parsePtr, int append,
-				CONST84 char ** termPtr);
+EXTERN int		Tcl_ParseBraces(Tcl_Interp *interp,
+				const char *start, int numBytes,
+				Tcl_Parse *parsePtr, int append,
+				CONST84 char **termPtr);
 #endif
 #ifndef Tcl_ParseCommand_TCL_DECLARED
 #define Tcl_ParseCommand_TCL_DECLARED
 /* 361 */
-EXTERN int		Tcl_ParseCommand (Tcl_Interp * interp,
-				const char * start, int numBytes, int nested,
-				Tcl_Parse * parsePtr);
+EXTERN int		Tcl_ParseCommand(Tcl_Interp *interp,
+				const char *start, int numBytes, int nested,
+				Tcl_Parse *parsePtr);
 #endif
 #ifndef Tcl_ParseExpr_TCL_DECLARED
 #define Tcl_ParseExpr_TCL_DECLARED
 /* 362 */
-EXTERN int		Tcl_ParseExpr (Tcl_Interp * interp,
-				const char * start, int numBytes,
-				Tcl_Parse * parsePtr);
+EXTERN int		Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
+				int numBytes, Tcl_Parse *parsePtr);
 #endif
 #ifndef Tcl_ParseQuotedString_TCL_DECLARED
 #define Tcl_ParseQuotedString_TCL_DECLARED
 /* 363 */
-EXTERN int		Tcl_ParseQuotedString (Tcl_Interp * interp,
-				const char * start, int numBytes,
-				Tcl_Parse * parsePtr, int append,
-				CONST84 char ** termPtr);
+EXTERN int		Tcl_ParseQuotedString(Tcl_Interp *interp,
+				const char *start, int numBytes,
+				Tcl_Parse *parsePtr, int append,
+				CONST84 char **termPtr);
 #endif
 #ifndef Tcl_ParseVarName_TCL_DECLARED
 #define Tcl_ParseVarName_TCL_DECLARED
 /* 364 */
-EXTERN int		Tcl_ParseVarName (Tcl_Interp * interp,
-				const char * start, int numBytes,
-				Tcl_Parse * parsePtr, int append);
+EXTERN int		Tcl_ParseVarName(Tcl_Interp *interp,
+				const char *start, int numBytes,
+				Tcl_Parse *parsePtr, int append);
 #endif
 #ifndef Tcl_GetCwd_TCL_DECLARED
 #define Tcl_GetCwd_TCL_DECLARED
 /* 365 */
-EXTERN char *		Tcl_GetCwd (Tcl_Interp * interp,
-				Tcl_DString * cwdPtr);
+EXTERN char *		Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
 #endif
 #ifndef Tcl_Chdir_TCL_DECLARED
 #define Tcl_Chdir_TCL_DECLARED
 /* 366 */
-EXTERN int		Tcl_Chdir (const char * dirName);
+EXTERN int		Tcl_Chdir(const char *dirName);
 #endif
 #ifndef Tcl_Access_TCL_DECLARED
 #define Tcl_Access_TCL_DECLARED
 /* 367 */
-EXTERN int		Tcl_Access (const char * path, int mode);
+EXTERN int		Tcl_Access(const char *path, int mode);
 #endif
 #ifndef Tcl_Stat_TCL_DECLARED
 #define Tcl_Stat_TCL_DECLARED
 /* 368 */
-EXTERN int		Tcl_Stat (const char * path, struct stat * bufPtr);
+EXTERN int		Tcl_Stat(const char *path, struct stat *bufPtr);
 #endif
 #ifndef Tcl_UtfNcmp_TCL_DECLARED
 #define Tcl_UtfNcmp_TCL_DECLARED
 /* 369 */
-EXTERN int		Tcl_UtfNcmp (const char * s1, const char * s2,
+EXTERN int		Tcl_UtfNcmp(const char *s1, const char *s2,
 				unsigned long n);
 #endif
 #ifndef Tcl_UtfNcasecmp_TCL_DECLARED
 #define Tcl_UtfNcasecmp_TCL_DECLARED
 /* 370 */
-EXTERN int		Tcl_UtfNcasecmp (const char * s1, const char * s2,
+EXTERN int		Tcl_UtfNcasecmp(const char *s1, const char *s2,
 				unsigned long n);
 #endif
 #ifndef Tcl_StringCaseMatch_TCL_DECLARED
 #define Tcl_StringCaseMatch_TCL_DECLARED
 /* 371 */
-EXTERN int		Tcl_StringCaseMatch (const char * str,
-				const char * pattern, int nocase);
+EXTERN int		Tcl_StringCaseMatch(const char *str,
+				const char *pattern, int nocase);
 #endif
 #ifndef Tcl_UniCharIsControl_TCL_DECLARED
 #define Tcl_UniCharIsControl_TCL_DECLARED
 /* 372 */
-EXTERN int		Tcl_UniCharIsControl (int ch);
+EXTERN int		Tcl_UniCharIsControl(int ch);
 #endif
 #ifndef Tcl_UniCharIsGraph_TCL_DECLARED
 #define Tcl_UniCharIsGraph_TCL_DECLARED
 /* 373 */
-EXTERN int		Tcl_UniCharIsGraph (int ch);
+EXTERN int		Tcl_UniCharIsGraph(int ch);
 #endif
 #ifndef Tcl_UniCharIsPrint_TCL_DECLARED
 #define Tcl_UniCharIsPrint_TCL_DECLARED
 /* 374 */
-EXTERN int		Tcl_UniCharIsPrint (int ch);
+EXTERN int		Tcl_UniCharIsPrint(int ch);
 #endif
 #ifndef Tcl_UniCharIsPunct_TCL_DECLARED
 #define Tcl_UniCharIsPunct_TCL_DECLARED
 /* 375 */
-EXTERN int		Tcl_UniCharIsPunct (int ch);
+EXTERN int		Tcl_UniCharIsPunct(int ch);
 #endif
 #ifndef Tcl_RegExpExecObj_TCL_DECLARED
 #define Tcl_RegExpExecObj_TCL_DECLARED
 /* 376 */
-EXTERN int		Tcl_RegExpExecObj (Tcl_Interp * interp,
-				Tcl_RegExp regexp, Tcl_Obj * textObj,
+EXTERN int		Tcl_RegExpExecObj(Tcl_Interp *interp,
+				Tcl_RegExp regexp, Tcl_Obj *textObj,
 				int offset, int nmatches, int flags);
 #endif
 #ifndef Tcl_RegExpGetInfo_TCL_DECLARED
 #define Tcl_RegExpGetInfo_TCL_DECLARED
 /* 377 */
-EXTERN void		Tcl_RegExpGetInfo (Tcl_RegExp regexp,
-				Tcl_RegExpInfo * infoPtr);
+EXTERN void		Tcl_RegExpGetInfo(Tcl_RegExp regexp,
+				Tcl_RegExpInfo *infoPtr);
 #endif
 #ifndef Tcl_NewUnicodeObj_TCL_DECLARED
 #define Tcl_NewUnicodeObj_TCL_DECLARED
 /* 378 */
-EXTERN Tcl_Obj *	Tcl_NewUnicodeObj (const Tcl_UniChar * unicode,
+EXTERN Tcl_Obj *	Tcl_NewUnicodeObj(const Tcl_UniChar *unicode,
 				int numChars);
 #endif
 #ifndef Tcl_SetUnicodeObj_TCL_DECLARED
 #define Tcl_SetUnicodeObj_TCL_DECLARED
 /* 379 */
-EXTERN void		Tcl_SetUnicodeObj (Tcl_Obj * objPtr,
-				const Tcl_UniChar * unicode, int numChars);
+EXTERN void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
+				const Tcl_UniChar *unicode, int numChars);
 #endif
 #ifndef Tcl_GetCharLength_TCL_DECLARED
 #define Tcl_GetCharLength_TCL_DECLARED
 /* 380 */
-EXTERN int		Tcl_GetCharLength (Tcl_Obj * objPtr);
+EXTERN int		Tcl_GetCharLength(Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetUniChar_TCL_DECLARED
 #define Tcl_GetUniChar_TCL_DECLARED
 /* 381 */
-EXTERN Tcl_UniChar	Tcl_GetUniChar (Tcl_Obj * objPtr, int index);
+EXTERN Tcl_UniChar	Tcl_GetUniChar(Tcl_Obj *objPtr, int index);
 #endif
 #ifndef Tcl_GetUnicode_TCL_DECLARED
 #define Tcl_GetUnicode_TCL_DECLARED
 /* 382 */
-EXTERN Tcl_UniChar *	Tcl_GetUnicode (Tcl_Obj * objPtr);
+EXTERN Tcl_UniChar *	Tcl_GetUnicode(Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetRange_TCL_DECLARED
 #define Tcl_GetRange_TCL_DECLARED
 /* 383 */
-EXTERN Tcl_Obj *	Tcl_GetRange (Tcl_Obj * objPtr, int first, int last);
+EXTERN Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, int first, int last);
 #endif
 #ifndef Tcl_AppendUnicodeToObj_TCL_DECLARED
 #define Tcl_AppendUnicodeToObj_TCL_DECLARED
 /* 384 */
-EXTERN void		Tcl_AppendUnicodeToObj (Tcl_Obj * objPtr,
-				const Tcl_UniChar * unicode, int length);
+EXTERN void		Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr,
+				const Tcl_UniChar *unicode, int length);
 #endif
 #ifndef Tcl_RegExpMatchObj_TCL_DECLARED
 #define Tcl_RegExpMatchObj_TCL_DECLARED
 /* 385 */
-EXTERN int		Tcl_RegExpMatchObj (Tcl_Interp * interp,
-				Tcl_Obj * textObj, Tcl_Obj * patternObj);
+EXTERN int		Tcl_RegExpMatchObj(Tcl_Interp *interp,
+				Tcl_Obj *textObj, Tcl_Obj *patternObj);
 #endif
 #ifndef Tcl_SetNotifier_TCL_DECLARED
 #define Tcl_SetNotifier_TCL_DECLARED
 /* 386 */
-EXTERN void		Tcl_SetNotifier (Tcl_NotifierProcs * notifierProcPtr);
+EXTERN void		Tcl_SetNotifier(Tcl_NotifierProcs *notifierProcPtr);
 #endif
 #ifndef Tcl_GetAllocMutex_TCL_DECLARED
 #define Tcl_GetAllocMutex_TCL_DECLARED
 /* 387 */
-EXTERN Tcl_Mutex *	Tcl_GetAllocMutex (void);
+EXTERN Tcl_Mutex *	Tcl_GetAllocMutex(void);
 #endif
 #ifndef Tcl_GetChannelNames_TCL_DECLARED
 #define Tcl_GetChannelNames_TCL_DECLARED
 /* 388 */
-EXTERN int		Tcl_GetChannelNames (Tcl_Interp * interp);
+EXTERN int		Tcl_GetChannelNames(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_GetChannelNamesEx_TCL_DECLARED
 #define Tcl_GetChannelNamesEx_TCL_DECLARED
 /* 389 */
-EXTERN int		Tcl_GetChannelNamesEx (Tcl_Interp * interp,
-				const char * pattern);
+EXTERN int		Tcl_GetChannelNamesEx(Tcl_Interp *interp,
+				const char *pattern);
 #endif
 #ifndef Tcl_ProcObjCmd_TCL_DECLARED
 #define Tcl_ProcObjCmd_TCL_DECLARED
 /* 390 */
-EXTERN int		Tcl_ProcObjCmd (ClientData clientData,
-				Tcl_Interp * interp, int objc,
+EXTERN int		Tcl_ProcObjCmd(ClientData clientData,
+				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_ConditionFinalize_TCL_DECLARED
 #define Tcl_ConditionFinalize_TCL_DECLARED
 /* 391 */
-EXTERN void		Tcl_ConditionFinalize (Tcl_Condition * condPtr);
+EXTERN void		Tcl_ConditionFinalize(Tcl_Condition *condPtr);
 #endif
 #ifndef Tcl_MutexFinalize_TCL_DECLARED
 #define Tcl_MutexFinalize_TCL_DECLARED
 /* 392 */
-EXTERN void		Tcl_MutexFinalize (Tcl_Mutex * mutex);
+EXTERN void		Tcl_MutexFinalize(Tcl_Mutex *mutex);
 #endif
 #ifndef Tcl_CreateThread_TCL_DECLARED
 #define Tcl_CreateThread_TCL_DECLARED
 /* 393 */
-EXTERN int		Tcl_CreateThread (Tcl_ThreadId * idPtr,
+EXTERN int		Tcl_CreateThread(Tcl_ThreadId *idPtr,
 				Tcl_ThreadCreateProc proc,
 				ClientData clientData, int stackSize,
 				int flags);
@@ -2355,1387 +2326,1363 @@ EXTERN int		Tcl_CreateThread (Tcl_ThreadId * idPtr,
 #ifndef Tcl_ReadRaw_TCL_DECLARED
 #define Tcl_ReadRaw_TCL_DECLARED
 /* 394 */
-EXTERN int		Tcl_ReadRaw (Tcl_Channel chan, char * dst,
+EXTERN int		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
 				int bytesToRead);
 #endif
 #ifndef Tcl_WriteRaw_TCL_DECLARED
 #define Tcl_WriteRaw_TCL_DECLARED
 /* 395 */
-EXTERN int		Tcl_WriteRaw (Tcl_Channel chan, const char * src,
+EXTERN int		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
 				int srcLen);
 #endif
 #ifndef Tcl_GetTopChannel_TCL_DECLARED
 #define Tcl_GetTopChannel_TCL_DECLARED
 /* 396 */
-EXTERN Tcl_Channel	Tcl_GetTopChannel (Tcl_Channel chan);
+EXTERN Tcl_Channel	Tcl_GetTopChannel(Tcl_Channel chan);
 #endif
 #ifndef Tcl_ChannelBuffered_TCL_DECLARED
 #define Tcl_ChannelBuffered_TCL_DECLARED
 /* 397 */
-EXTERN int		Tcl_ChannelBuffered (Tcl_Channel chan);
+EXTERN int		Tcl_ChannelBuffered(Tcl_Channel chan);
 #endif
 #ifndef Tcl_ChannelName_TCL_DECLARED
 #define Tcl_ChannelName_TCL_DECLARED
 /* 398 */
-EXTERN CONST84_RETURN char * Tcl_ChannelName (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN CONST84_RETURN char * Tcl_ChannelName(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelVersion_TCL_DECLARED
 #define Tcl_ChannelVersion_TCL_DECLARED
 /* 399 */
-EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelBlockModeProc_TCL_DECLARED
 #define Tcl_ChannelBlockModeProc_TCL_DECLARED
 /* 400 */
-EXTERN Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelCloseProc_TCL_DECLARED
 #define Tcl_ChannelCloseProc_TCL_DECLARED
 /* 401 */
-EXTERN Tcl_DriverCloseProc * Tcl_ChannelCloseProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverCloseProc * Tcl_ChannelCloseProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelClose2Proc_TCL_DECLARED
 #define Tcl_ChannelClose2Proc_TCL_DECLARED
 /* 402 */
-EXTERN Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelInputProc_TCL_DECLARED
 #define Tcl_ChannelInputProc_TCL_DECLARED
 /* 403 */
-EXTERN Tcl_DriverInputProc * Tcl_ChannelInputProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverInputProc * Tcl_ChannelInputProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelOutputProc_TCL_DECLARED
 #define Tcl_ChannelOutputProc_TCL_DECLARED
 /* 404 */
-EXTERN Tcl_DriverOutputProc * Tcl_ChannelOutputProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverOutputProc * Tcl_ChannelOutputProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelSeekProc_TCL_DECLARED
 #define Tcl_ChannelSeekProc_TCL_DECLARED
 /* 405 */
-EXTERN Tcl_DriverSeekProc * Tcl_ChannelSeekProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverSeekProc * Tcl_ChannelSeekProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelSetOptionProc_TCL_DECLARED
 #define Tcl_ChannelSetOptionProc_TCL_DECLARED
 /* 406 */
-EXTERN Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelGetOptionProc_TCL_DECLARED
 #define Tcl_ChannelGetOptionProc_TCL_DECLARED
 /* 407 */
-EXTERN Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelWatchProc_TCL_DECLARED
 #define Tcl_ChannelWatchProc_TCL_DECLARED
 /* 408 */
-EXTERN Tcl_DriverWatchProc * Tcl_ChannelWatchProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverWatchProc * Tcl_ChannelWatchProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelGetHandleProc_TCL_DECLARED
 #define Tcl_ChannelGetHandleProc_TCL_DECLARED
 /* 409 */
-EXTERN Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelFlushProc_TCL_DECLARED
 #define Tcl_ChannelFlushProc_TCL_DECLARED
 /* 410 */
-EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_ChannelHandlerProc_TCL_DECLARED
 #define Tcl_ChannelHandlerProc_TCL_DECLARED
 /* 411 */
-EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_JoinThread_TCL_DECLARED
 #define Tcl_JoinThread_TCL_DECLARED
 /* 412 */
-EXTERN int		Tcl_JoinThread (Tcl_ThreadId threadId, int * result);
+EXTERN int		Tcl_JoinThread(Tcl_ThreadId threadId, int *result);
 #endif
 #ifndef Tcl_IsChannelShared_TCL_DECLARED
 #define Tcl_IsChannelShared_TCL_DECLARED
 /* 413 */
-EXTERN int		Tcl_IsChannelShared (Tcl_Channel channel);
+EXTERN int		Tcl_IsChannelShared(Tcl_Channel channel);
 #endif
 #ifndef Tcl_IsChannelRegistered_TCL_DECLARED
 #define Tcl_IsChannelRegistered_TCL_DECLARED
 /* 414 */
-EXTERN int		Tcl_IsChannelRegistered (Tcl_Interp * interp,
+EXTERN int		Tcl_IsChannelRegistered(Tcl_Interp *interp,
 				Tcl_Channel channel);
 #endif
 #ifndef Tcl_CutChannel_TCL_DECLARED
 #define Tcl_CutChannel_TCL_DECLARED
 /* 415 */
-EXTERN void		Tcl_CutChannel (Tcl_Channel channel);
+EXTERN void		Tcl_CutChannel(Tcl_Channel channel);
 #endif
 #ifndef Tcl_SpliceChannel_TCL_DECLARED
 #define Tcl_SpliceChannel_TCL_DECLARED
 /* 416 */
-EXTERN void		Tcl_SpliceChannel (Tcl_Channel channel);
+EXTERN void		Tcl_SpliceChannel(Tcl_Channel channel);
 #endif
 #ifndef Tcl_ClearChannelHandlers_TCL_DECLARED
 #define Tcl_ClearChannelHandlers_TCL_DECLARED
 /* 417 */
-EXTERN void		Tcl_ClearChannelHandlers (Tcl_Channel channel);
+EXTERN void		Tcl_ClearChannelHandlers(Tcl_Channel channel);
 #endif
 #ifndef Tcl_IsChannelExisting_TCL_DECLARED
 #define Tcl_IsChannelExisting_TCL_DECLARED
 /* 418 */
-EXTERN int		Tcl_IsChannelExisting (const char * channelName);
+EXTERN int		Tcl_IsChannelExisting(const char *channelName);
 #endif
 #ifndef Tcl_UniCharNcasecmp_TCL_DECLARED
 #define Tcl_UniCharNcasecmp_TCL_DECLARED
 /* 419 */
-EXTERN int		Tcl_UniCharNcasecmp (const Tcl_UniChar * ucs,
-				const Tcl_UniChar * uct,
+EXTERN int		Tcl_UniCharNcasecmp(const Tcl_UniChar *ucs,
+				const Tcl_UniChar *uct,
 				unsigned long numChars);
 #endif
 #ifndef Tcl_UniCharCaseMatch_TCL_DECLARED
 #define Tcl_UniCharCaseMatch_TCL_DECLARED
 /* 420 */
-EXTERN int		Tcl_UniCharCaseMatch (const Tcl_UniChar * uniStr,
-				const Tcl_UniChar * uniPattern, int nocase);
+EXTERN int		Tcl_UniCharCaseMatch(const Tcl_UniChar *uniStr,
+				const Tcl_UniChar *uniPattern, int nocase);
 #endif
 #ifndef Tcl_FindHashEntry_TCL_DECLARED
 #define Tcl_FindHashEntry_TCL_DECLARED
 /* 421 */
-EXTERN Tcl_HashEntry *	Tcl_FindHashEntry (Tcl_HashTable * tablePtr,
-				const char * key);
+EXTERN Tcl_HashEntry *	Tcl_FindHashEntry(Tcl_HashTable *tablePtr,
+				const char *key);
 #endif
 #ifndef Tcl_CreateHashEntry_TCL_DECLARED
 #define Tcl_CreateHashEntry_TCL_DECLARED
 /* 422 */
-EXTERN Tcl_HashEntry *	Tcl_CreateHashEntry (Tcl_HashTable * tablePtr,
-				const char * key, int * newPtr);
+EXTERN Tcl_HashEntry *	Tcl_CreateHashEntry(Tcl_HashTable *tablePtr,
+				const char *key, int *newPtr);
 #endif
 #ifndef Tcl_InitCustomHashTable_TCL_DECLARED
 #define Tcl_InitCustomHashTable_TCL_DECLARED
 /* 423 */
-EXTERN void		Tcl_InitCustomHashTable (Tcl_HashTable * tablePtr,
-				int keyType, const Tcl_HashKeyType * typePtr);
+EXTERN void		Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr,
+				int keyType, const Tcl_HashKeyType *typePtr);
 #endif
 #ifndef Tcl_InitObjHashTable_TCL_DECLARED
 #define Tcl_InitObjHashTable_TCL_DECLARED
 /* 424 */
-EXTERN void		Tcl_InitObjHashTable (Tcl_HashTable * tablePtr);
+EXTERN void		Tcl_InitObjHashTable(Tcl_HashTable *tablePtr);
 #endif
 #ifndef Tcl_CommandTraceInfo_TCL_DECLARED
 #define Tcl_CommandTraceInfo_TCL_DECLARED
 /* 425 */
-EXTERN ClientData	Tcl_CommandTraceInfo (Tcl_Interp * interp,
-				const char * varName, int flags,
-				Tcl_CommandTraceProc * procPtr,
+EXTERN ClientData	Tcl_CommandTraceInfo(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *procPtr,
 				ClientData prevClientData);
 #endif
 #ifndef Tcl_TraceCommand_TCL_DECLARED
 #define Tcl_TraceCommand_TCL_DECLARED
 /* 426 */
-EXTERN int		Tcl_TraceCommand (Tcl_Interp * interp,
-				const char * varName, int flags,
-				Tcl_CommandTraceProc * proc,
+EXTERN int		Tcl_TraceCommand(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_UntraceCommand_TCL_DECLARED
 #define Tcl_UntraceCommand_TCL_DECLARED
 /* 427 */
-EXTERN void		Tcl_UntraceCommand (Tcl_Interp * interp,
-				const char * varName, int flags,
-				Tcl_CommandTraceProc * proc,
+EXTERN void		Tcl_UntraceCommand(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *proc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_AttemptAlloc_TCL_DECLARED
 #define Tcl_AttemptAlloc_TCL_DECLARED
 /* 428 */
-EXTERN char *		Tcl_AttemptAlloc (unsigned int size);
+EXTERN char *		Tcl_AttemptAlloc(unsigned int size);
 #endif
 #ifndef Tcl_AttemptDbCkalloc_TCL_DECLARED
 #define Tcl_AttemptDbCkalloc_TCL_DECLARED
 /* 429 */
-EXTERN char *		Tcl_AttemptDbCkalloc (unsigned int size,
-				const char * file, int line);
+EXTERN char *		Tcl_AttemptDbCkalloc(unsigned int size,
+				const char *file, int line);
 #endif
 #ifndef Tcl_AttemptRealloc_TCL_DECLARED
 #define Tcl_AttemptRealloc_TCL_DECLARED
 /* 430 */
-EXTERN char *		Tcl_AttemptRealloc (char * ptr, unsigned int size);
+EXTERN char *		Tcl_AttemptRealloc(char *ptr, unsigned int size);
 #endif
 #ifndef Tcl_AttemptDbCkrealloc_TCL_DECLARED
 #define Tcl_AttemptDbCkrealloc_TCL_DECLARED
 /* 431 */
-EXTERN char *		Tcl_AttemptDbCkrealloc (char * ptr,
-				unsigned int size, const char * file,
-				int line);
+EXTERN char *		Tcl_AttemptDbCkrealloc(char *ptr, unsigned int size,
+				const char *file, int line);
 #endif
 #ifndef Tcl_AttemptSetObjLength_TCL_DECLARED
 #define Tcl_AttemptSetObjLength_TCL_DECLARED
 /* 432 */
-EXTERN int		Tcl_AttemptSetObjLength (Tcl_Obj * objPtr,
-				int length);
+EXTERN int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, int length);
 #endif
 #ifndef Tcl_GetChannelThread_TCL_DECLARED
 #define Tcl_GetChannelThread_TCL_DECLARED
 /* 433 */
-EXTERN Tcl_ThreadId	Tcl_GetChannelThread (Tcl_Channel channel);
+EXTERN Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
 #endif
 #ifndef Tcl_GetUnicodeFromObj_TCL_DECLARED
 #define Tcl_GetUnicodeFromObj_TCL_DECLARED
 /* 434 */
-EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj (Tcl_Obj * objPtr,
-				int * lengthPtr);
+EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
+				int *lengthPtr);
 #endif
 #ifndef Tcl_GetMathFuncInfo_TCL_DECLARED
 #define Tcl_GetMathFuncInfo_TCL_DECLARED
 /* 435 */
-EXTERN int		Tcl_GetMathFuncInfo (Tcl_Interp * interp,
-				const char * name, int * numArgsPtr,
-				Tcl_ValueType ** argTypesPtr,
-				Tcl_MathProc ** procPtr,
-				ClientData * clientDataPtr);
+EXTERN int		Tcl_GetMathFuncInfo(Tcl_Interp *interp,
+				const char *name, int *numArgsPtr,
+				Tcl_ValueType **argTypesPtr,
+				Tcl_MathProc **procPtr,
+				ClientData *clientDataPtr);
 #endif
 #ifndef Tcl_ListMathFuncs_TCL_DECLARED
 #define Tcl_ListMathFuncs_TCL_DECLARED
 /* 436 */
-EXTERN Tcl_Obj *	Tcl_ListMathFuncs (Tcl_Interp * interp,
-				const char * pattern);
+EXTERN Tcl_Obj *	Tcl_ListMathFuncs(Tcl_Interp *interp,
+				const char *pattern);
 #endif
 #ifndef Tcl_SubstObj_TCL_DECLARED
 #define Tcl_SubstObj_TCL_DECLARED
 /* 437 */
-EXTERN Tcl_Obj *	Tcl_SubstObj (Tcl_Interp * interp, Tcl_Obj * objPtr,
+EXTERN Tcl_Obj *	Tcl_SubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags);
 #endif
 #ifndef Tcl_DetachChannel_TCL_DECLARED
 #define Tcl_DetachChannel_TCL_DECLARED
 /* 438 */
-EXTERN int		Tcl_DetachChannel (Tcl_Interp * interp,
+EXTERN int		Tcl_DetachChannel(Tcl_Interp *interp,
 				Tcl_Channel channel);
 #endif
 #ifndef Tcl_IsStandardChannel_TCL_DECLARED
 #define Tcl_IsStandardChannel_TCL_DECLARED
 /* 439 */
-EXTERN int		Tcl_IsStandardChannel (Tcl_Channel channel);
+EXTERN int		Tcl_IsStandardChannel(Tcl_Channel channel);
 #endif
 #ifndef Tcl_FSCopyFile_TCL_DECLARED
 #define Tcl_FSCopyFile_TCL_DECLARED
 /* 440 */
-EXTERN int		Tcl_FSCopyFile (Tcl_Obj * srcPathPtr,
-				Tcl_Obj * destPathPtr);
+EXTERN int		Tcl_FSCopyFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
 #endif
 #ifndef Tcl_FSCopyDirectory_TCL_DECLARED
 #define Tcl_FSCopyDirectory_TCL_DECLARED
 /* 441 */
-EXTERN int		Tcl_FSCopyDirectory (Tcl_Obj * srcPathPtr,
-				Tcl_Obj * destPathPtr, Tcl_Obj ** errorPtr);
+EXTERN int		Tcl_FSCopyDirectory(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
 #endif
 #ifndef Tcl_FSCreateDirectory_TCL_DECLARED
 #define Tcl_FSCreateDirectory_TCL_DECLARED
 /* 442 */
-EXTERN int		Tcl_FSCreateDirectory (Tcl_Obj * pathPtr);
+EXTERN int		Tcl_FSCreateDirectory(Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSDeleteFile_TCL_DECLARED
 #define Tcl_FSDeleteFile_TCL_DECLARED
 /* 443 */
-EXTERN int		Tcl_FSDeleteFile (Tcl_Obj * pathPtr);
+EXTERN int		Tcl_FSDeleteFile(Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSLoadFile_TCL_DECLARED
 #define Tcl_FSLoadFile_TCL_DECLARED
 /* 444 */
-EXTERN int		Tcl_FSLoadFile (Tcl_Interp * interp,
-				Tcl_Obj * pathPtr, const char * sym1,
-				const char * sym2,
-				Tcl_PackageInitProc ** proc1Ptr,
-				Tcl_PackageInitProc ** proc2Ptr,
-				Tcl_LoadHandle * handlePtr,
-				Tcl_FSUnloadFileProc ** unloadProcPtr);
+EXTERN int		Tcl_FSLoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+				const char *sym1, const char *sym2,
+				Tcl_PackageInitProc **proc1Ptr,
+				Tcl_PackageInitProc **proc2Ptr,
+				Tcl_LoadHandle *handlePtr,
+				Tcl_FSUnloadFileProc **unloadProcPtr);
 #endif
 #ifndef Tcl_FSMatchInDirectory_TCL_DECLARED
 #define Tcl_FSMatchInDirectory_TCL_DECLARED
 /* 445 */
-EXTERN int		Tcl_FSMatchInDirectory (Tcl_Interp * interp,
-				Tcl_Obj * result, Tcl_Obj * pathPtr,
-				const char * pattern,
-				Tcl_GlobTypeData * types);
+EXTERN int		Tcl_FSMatchInDirectory(Tcl_Interp *interp,
+				Tcl_Obj *result, Tcl_Obj *pathPtr,
+				const char *pattern, Tcl_GlobTypeData *types);
 #endif
 #ifndef Tcl_FSLink_TCL_DECLARED
 #define Tcl_FSLink_TCL_DECLARED
 /* 446 */
-EXTERN Tcl_Obj *	Tcl_FSLink (Tcl_Obj * pathPtr, Tcl_Obj * toPtr,
+EXTERN Tcl_Obj *	Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
 				int linkAction);
 #endif
 #ifndef Tcl_FSRemoveDirectory_TCL_DECLARED
 #define Tcl_FSRemoveDirectory_TCL_DECLARED
 /* 447 */
-EXTERN int		Tcl_FSRemoveDirectory (Tcl_Obj * pathPtr,
-				int recursive, Tcl_Obj ** errorPtr);
+EXTERN int		Tcl_FSRemoveDirectory(Tcl_Obj *pathPtr,
+				int recursive, Tcl_Obj **errorPtr);
 #endif
 #ifndef Tcl_FSRenameFile_TCL_DECLARED
 #define Tcl_FSRenameFile_TCL_DECLARED
 /* 448 */
-EXTERN int		Tcl_FSRenameFile (Tcl_Obj * srcPathPtr,
-				Tcl_Obj * destPathPtr);
+EXTERN int		Tcl_FSRenameFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
 #endif
 #ifndef Tcl_FSLstat_TCL_DECLARED
 #define Tcl_FSLstat_TCL_DECLARED
 /* 449 */
-EXTERN int		Tcl_FSLstat (Tcl_Obj * pathPtr, Tcl_StatBuf * buf);
+EXTERN int		Tcl_FSLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
 #endif
 #ifndef Tcl_FSUtime_TCL_DECLARED
 #define Tcl_FSUtime_TCL_DECLARED
 /* 450 */
-EXTERN int		Tcl_FSUtime (Tcl_Obj * pathPtr,
-				struct utimbuf * tval);
+EXTERN int		Tcl_FSUtime(Tcl_Obj *pathPtr, struct utimbuf *tval);
 #endif
 #ifndef Tcl_FSFileAttrsGet_TCL_DECLARED
 #define Tcl_FSFileAttrsGet_TCL_DECLARED
 /* 451 */
-EXTERN int		Tcl_FSFileAttrsGet (Tcl_Interp * interp, int index,
-				Tcl_Obj * pathPtr, Tcl_Obj ** objPtrRef);
+EXTERN int		Tcl_FSFileAttrsGet(Tcl_Interp *interp, int index,
+				Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef);
 #endif
 #ifndef Tcl_FSFileAttrsSet_TCL_DECLARED
 #define Tcl_FSFileAttrsSet_TCL_DECLARED
 /* 452 */
-EXTERN int		Tcl_FSFileAttrsSet (Tcl_Interp * interp, int index,
-				Tcl_Obj * pathPtr, Tcl_Obj * objPtr);
+EXTERN int		Tcl_FSFileAttrsSet(Tcl_Interp *interp, int index,
+				Tcl_Obj *pathPtr, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_FSFileAttrStrings_TCL_DECLARED
 #define Tcl_FSFileAttrStrings_TCL_DECLARED
 /* 453 */
-EXTERN const char *CONST86 * Tcl_FSFileAttrStrings (Tcl_Obj * pathPtr,
-				Tcl_Obj ** objPtrRef);
+EXTERN const char *CONST86 * Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr,
+				Tcl_Obj **objPtrRef);
 #endif
 #ifndef Tcl_FSStat_TCL_DECLARED
 #define Tcl_FSStat_TCL_DECLARED
 /* 454 */
-EXTERN int		Tcl_FSStat (Tcl_Obj * pathPtr, Tcl_StatBuf * buf);
+EXTERN int		Tcl_FSStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
 #endif
 #ifndef Tcl_FSAccess_TCL_DECLARED
 #define Tcl_FSAccess_TCL_DECLARED
 /* 455 */
-EXTERN int		Tcl_FSAccess (Tcl_Obj * pathPtr, int mode);
+EXTERN int		Tcl_FSAccess(Tcl_Obj *pathPtr, int mode);
 #endif
 #ifndef Tcl_FSOpenFileChannel_TCL_DECLARED
 #define Tcl_FSOpenFileChannel_TCL_DECLARED
 /* 456 */
-EXTERN Tcl_Channel	Tcl_FSOpenFileChannel (Tcl_Interp * interp,
-				Tcl_Obj * pathPtr, const char * modeString,
+EXTERN Tcl_Channel	Tcl_FSOpenFileChannel(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr, const char *modeString,
 				int permissions);
 #endif
 #ifndef Tcl_FSGetCwd_TCL_DECLARED
 #define Tcl_FSGetCwd_TCL_DECLARED
 /* 457 */
-EXTERN Tcl_Obj *	Tcl_FSGetCwd (Tcl_Interp * interp);
+EXTERN Tcl_Obj *	Tcl_FSGetCwd(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_FSChdir_TCL_DECLARED
 #define Tcl_FSChdir_TCL_DECLARED
 /* 458 */
-EXTERN int		Tcl_FSChdir (Tcl_Obj * pathPtr);
+EXTERN int		Tcl_FSChdir(Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSConvertToPathType_TCL_DECLARED
 #define Tcl_FSConvertToPathType_TCL_DECLARED
 /* 459 */
-EXTERN int		Tcl_FSConvertToPathType (Tcl_Interp * interp,
-				Tcl_Obj * pathPtr);
+EXTERN int		Tcl_FSConvertToPathType(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSJoinPath_TCL_DECLARED
 #define Tcl_FSJoinPath_TCL_DECLARED
 /* 460 */
-EXTERN Tcl_Obj *	Tcl_FSJoinPath (Tcl_Obj * listObj, int elements);
+EXTERN Tcl_Obj *	Tcl_FSJoinPath(Tcl_Obj *listObj, int elements);
 #endif
 #ifndef Tcl_FSSplitPath_TCL_DECLARED
 #define Tcl_FSSplitPath_TCL_DECLARED
 /* 461 */
-EXTERN Tcl_Obj *	Tcl_FSSplitPath (Tcl_Obj * pathPtr, int * lenPtr);
+EXTERN Tcl_Obj *	Tcl_FSSplitPath(Tcl_Obj *pathPtr, int *lenPtr);
 #endif
 #ifndef Tcl_FSEqualPaths_TCL_DECLARED
 #define Tcl_FSEqualPaths_TCL_DECLARED
 /* 462 */
-EXTERN int		Tcl_FSEqualPaths (Tcl_Obj * firstPtr,
-				Tcl_Obj * secondPtr);
+EXTERN int		Tcl_FSEqualPaths(Tcl_Obj *firstPtr,
+				Tcl_Obj *secondPtr);
 #endif
 #ifndef Tcl_FSGetNormalizedPath_TCL_DECLARED
 #define Tcl_FSGetNormalizedPath_TCL_DECLARED
 /* 463 */
-EXTERN Tcl_Obj *	Tcl_FSGetNormalizedPath (Tcl_Interp * interp,
-				Tcl_Obj * pathPtr);
+EXTERN Tcl_Obj *	Tcl_FSGetNormalizedPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSJoinToPath_TCL_DECLARED
 #define Tcl_FSJoinToPath_TCL_DECLARED
 /* 464 */
-EXTERN Tcl_Obj *	Tcl_FSJoinToPath (Tcl_Obj * pathPtr, int objc,
+EXTERN Tcl_Obj *	Tcl_FSJoinToPath(Tcl_Obj *pathPtr, int objc,
 				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_FSGetInternalRep_TCL_DECLARED
 #define Tcl_FSGetInternalRep_TCL_DECLARED
 /* 465 */
-EXTERN ClientData	Tcl_FSGetInternalRep (Tcl_Obj * pathPtr,
-				const Tcl_Filesystem * fsPtr);
+EXTERN ClientData	Tcl_FSGetInternalRep(Tcl_Obj *pathPtr,
+				const Tcl_Filesystem *fsPtr);
 #endif
 #ifndef Tcl_FSGetTranslatedPath_TCL_DECLARED
 #define Tcl_FSGetTranslatedPath_TCL_DECLARED
 /* 466 */
-EXTERN Tcl_Obj *	Tcl_FSGetTranslatedPath (Tcl_Interp * interp,
-				Tcl_Obj * pathPtr);
+EXTERN Tcl_Obj *	Tcl_FSGetTranslatedPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSEvalFile_TCL_DECLARED
 #define Tcl_FSEvalFile_TCL_DECLARED
 /* 467 */
-EXTERN int		Tcl_FSEvalFile (Tcl_Interp * interp,
-				Tcl_Obj * fileName);
+EXTERN int		Tcl_FSEvalFile(Tcl_Interp *interp, Tcl_Obj *fileName);
 #endif
 #ifndef Tcl_FSNewNativePath_TCL_DECLARED
 #define Tcl_FSNewNativePath_TCL_DECLARED
 /* 468 */
-EXTERN Tcl_Obj *	Tcl_FSNewNativePath (
-				const Tcl_Filesystem * fromFilesystem,
+EXTERN Tcl_Obj *	Tcl_FSNewNativePath(
+				const Tcl_Filesystem *fromFilesystem,
 				ClientData clientData);
 #endif
 #ifndef Tcl_FSGetNativePath_TCL_DECLARED
 #define Tcl_FSGetNativePath_TCL_DECLARED
 /* 469 */
-EXTERN const char *	Tcl_FSGetNativePath (Tcl_Obj * pathPtr);
+EXTERN const char *	Tcl_FSGetNativePath(Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSFileSystemInfo_TCL_DECLARED
 #define Tcl_FSFileSystemInfo_TCL_DECLARED
 /* 470 */
-EXTERN Tcl_Obj *	Tcl_FSFileSystemInfo (Tcl_Obj * pathPtr);
+EXTERN Tcl_Obj *	Tcl_FSFileSystemInfo(Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSPathSeparator_TCL_DECLARED
 #define Tcl_FSPathSeparator_TCL_DECLARED
 /* 471 */
-EXTERN Tcl_Obj *	Tcl_FSPathSeparator (Tcl_Obj * pathPtr);
+EXTERN Tcl_Obj *	Tcl_FSPathSeparator(Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSListVolumes_TCL_DECLARED
 #define Tcl_FSListVolumes_TCL_DECLARED
 /* 472 */
-EXTERN Tcl_Obj *	Tcl_FSListVolumes (void);
+EXTERN Tcl_Obj *	Tcl_FSListVolumes(void);
 #endif
 #ifndef Tcl_FSRegister_TCL_DECLARED
 #define Tcl_FSRegister_TCL_DECLARED
 /* 473 */
-EXTERN int		Tcl_FSRegister (ClientData clientData,
-				const Tcl_Filesystem * fsPtr);
+EXTERN int		Tcl_FSRegister(ClientData clientData,
+				const Tcl_Filesystem *fsPtr);
 #endif
 #ifndef Tcl_FSUnregister_TCL_DECLARED
 #define Tcl_FSUnregister_TCL_DECLARED
 /* 474 */
-EXTERN int		Tcl_FSUnregister (const Tcl_Filesystem * fsPtr);
+EXTERN int		Tcl_FSUnregister(const Tcl_Filesystem *fsPtr);
 #endif
 #ifndef Tcl_FSData_TCL_DECLARED
 #define Tcl_FSData_TCL_DECLARED
 /* 475 */
-EXTERN ClientData	Tcl_FSData (const Tcl_Filesystem * fsPtr);
+EXTERN ClientData	Tcl_FSData(const Tcl_Filesystem *fsPtr);
 #endif
 #ifndef Tcl_FSGetTranslatedStringPath_TCL_DECLARED
 #define Tcl_FSGetTranslatedStringPath_TCL_DECLARED
 /* 476 */
-EXTERN const char *	Tcl_FSGetTranslatedStringPath (Tcl_Interp * interp,
-				Tcl_Obj * pathPtr);
+EXTERN const char *	Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSGetFileSystemForPath_TCL_DECLARED
 #define Tcl_FSGetFileSystemForPath_TCL_DECLARED
 /* 477 */
-EXTERN CONST86 Tcl_Filesystem * Tcl_FSGetFileSystemForPath (
-				Tcl_Obj * pathPtr);
+EXTERN CONST86 Tcl_Filesystem * Tcl_FSGetFileSystemForPath(Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_FSGetPathType_TCL_DECLARED
 #define Tcl_FSGetPathType_TCL_DECLARED
 /* 478 */
-EXTERN Tcl_PathType	Tcl_FSGetPathType (Tcl_Obj * pathPtr);
+EXTERN Tcl_PathType	Tcl_FSGetPathType(Tcl_Obj *pathPtr);
 #endif
 #ifndef Tcl_OutputBuffered_TCL_DECLARED
 #define Tcl_OutputBuffered_TCL_DECLARED
 /* 479 */
-EXTERN int		Tcl_OutputBuffered (Tcl_Channel chan);
+EXTERN int		Tcl_OutputBuffered(Tcl_Channel chan);
 #endif
 #ifndef Tcl_FSMountsChanged_TCL_DECLARED
 #define Tcl_FSMountsChanged_TCL_DECLARED
 /* 480 */
-EXTERN void		Tcl_FSMountsChanged (const Tcl_Filesystem * fsPtr);
+EXTERN void		Tcl_FSMountsChanged(const Tcl_Filesystem *fsPtr);
 #endif
 #ifndef Tcl_EvalTokensStandard_TCL_DECLARED
 #define Tcl_EvalTokensStandard_TCL_DECLARED
 /* 481 */
-EXTERN int		Tcl_EvalTokensStandard (Tcl_Interp * interp,
-				Tcl_Token * tokenPtr, int count);
+EXTERN int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
+				Tcl_Token *tokenPtr, int count);
 #endif
 #ifndef Tcl_GetTime_TCL_DECLARED
 #define Tcl_GetTime_TCL_DECLARED
 /* 482 */
-EXTERN void		Tcl_GetTime (Tcl_Time * timeBuf);
+EXTERN void		Tcl_GetTime(Tcl_Time *timeBuf);
 #endif
 #ifndef Tcl_CreateObjTrace_TCL_DECLARED
 #define Tcl_CreateObjTrace_TCL_DECLARED
 /* 483 */
-EXTERN Tcl_Trace	Tcl_CreateObjTrace (Tcl_Interp * interp, int level,
-				int flags, Tcl_CmdObjTraceProc * objProc,
+EXTERN Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp, int level,
+				int flags, Tcl_CmdObjTraceProc *objProc,
 				ClientData clientData,
-				Tcl_CmdObjTraceDeleteProc * delProc);
+				Tcl_CmdObjTraceDeleteProc *delProc);
 #endif
 #ifndef Tcl_GetCommandInfoFromToken_TCL_DECLARED
 #define Tcl_GetCommandInfoFromToken_TCL_DECLARED
 /* 484 */
-EXTERN int		Tcl_GetCommandInfoFromToken (Tcl_Command token,
-				Tcl_CmdInfo * infoPtr);
+EXTERN int		Tcl_GetCommandInfoFromToken(Tcl_Command token,
+				Tcl_CmdInfo *infoPtr);
 #endif
 #ifndef Tcl_SetCommandInfoFromToken_TCL_DECLARED
 #define Tcl_SetCommandInfoFromToken_TCL_DECLARED
 /* 485 */
-EXTERN int		Tcl_SetCommandInfoFromToken (Tcl_Command token,
-				const Tcl_CmdInfo * infoPtr);
+EXTERN int		Tcl_SetCommandInfoFromToken(Tcl_Command token,
+				const Tcl_CmdInfo *infoPtr);
 #endif
 #ifndef Tcl_DbNewWideIntObj_TCL_DECLARED
 #define Tcl_DbNewWideIntObj_TCL_DECLARED
 /* 486 */
-EXTERN Tcl_Obj *	Tcl_DbNewWideIntObj (Tcl_WideInt wideValue,
-				const char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewWideIntObj(Tcl_WideInt wideValue,
+				const char *file, int line);
 #endif
 #ifndef Tcl_GetWideIntFromObj_TCL_DECLARED
 #define Tcl_GetWideIntFromObj_TCL_DECLARED
 /* 487 */
-EXTERN int		Tcl_GetWideIntFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, Tcl_WideInt * widePtr);
+EXTERN int		Tcl_GetWideIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_WideInt *widePtr);
 #endif
 #ifndef Tcl_NewWideIntObj_TCL_DECLARED
 #define Tcl_NewWideIntObj_TCL_DECLARED
 /* 488 */
-EXTERN Tcl_Obj *	Tcl_NewWideIntObj (Tcl_WideInt wideValue);
+EXTERN Tcl_Obj *	Tcl_NewWideIntObj(Tcl_WideInt wideValue);
 #endif
 #ifndef Tcl_SetWideIntObj_TCL_DECLARED
 #define Tcl_SetWideIntObj_TCL_DECLARED
 /* 489 */
-EXTERN void		Tcl_SetWideIntObj (Tcl_Obj * objPtr,
+EXTERN void		Tcl_SetWideIntObj(Tcl_Obj *objPtr,
 				Tcl_WideInt wideValue);
 #endif
 #ifndef Tcl_AllocStatBuf_TCL_DECLARED
 #define Tcl_AllocStatBuf_TCL_DECLARED
 /* 490 */
-EXTERN Tcl_StatBuf *	Tcl_AllocStatBuf (void);
+EXTERN Tcl_StatBuf *	Tcl_AllocStatBuf(void);
 #endif
 #ifndef Tcl_Seek_TCL_DECLARED
 #define Tcl_Seek_TCL_DECLARED
 /* 491 */
-EXTERN Tcl_WideInt	Tcl_Seek (Tcl_Channel chan, Tcl_WideInt offset,
+EXTERN Tcl_WideInt	Tcl_Seek(Tcl_Channel chan, Tcl_WideInt offset,
 				int mode);
 #endif
 #ifndef Tcl_Tell_TCL_DECLARED
 #define Tcl_Tell_TCL_DECLARED
 /* 492 */
-EXTERN Tcl_WideInt	Tcl_Tell (Tcl_Channel chan);
+EXTERN Tcl_WideInt	Tcl_Tell(Tcl_Channel chan);
 #endif
 #ifndef Tcl_ChannelWideSeekProc_TCL_DECLARED
 #define Tcl_ChannelWideSeekProc_TCL_DECLARED
 /* 493 */
-EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_DictObjPut_TCL_DECLARED
 #define Tcl_DictObjPut_TCL_DECLARED
 /* 494 */
-EXTERN int		Tcl_DictObjPut (Tcl_Interp * interp,
-				Tcl_Obj * dictPtr, Tcl_Obj * keyPtr,
-				Tcl_Obj * valuePtr);
+EXTERN int		Tcl_DictObjPut(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				Tcl_Obj *keyPtr, Tcl_Obj *valuePtr);
 #endif
 #ifndef Tcl_DictObjGet_TCL_DECLARED
 #define Tcl_DictObjGet_TCL_DECLARED
 /* 495 */
-EXTERN int		Tcl_DictObjGet (Tcl_Interp * interp,
-				Tcl_Obj * dictPtr, Tcl_Obj * keyPtr,
-				Tcl_Obj ** valuePtrPtr);
+EXTERN int		Tcl_DictObjGet(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr);
 #endif
 #ifndef Tcl_DictObjRemove_TCL_DECLARED
 #define Tcl_DictObjRemove_TCL_DECLARED
 /* 496 */
-EXTERN int		Tcl_DictObjRemove (Tcl_Interp * interp,
-				Tcl_Obj * dictPtr, Tcl_Obj * keyPtr);
+EXTERN int		Tcl_DictObjRemove(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_Obj *keyPtr);
 #endif
 #ifndef Tcl_DictObjSize_TCL_DECLARED
 #define Tcl_DictObjSize_TCL_DECLARED
 /* 497 */
-EXTERN int		Tcl_DictObjSize (Tcl_Interp * interp,
-				Tcl_Obj * dictPtr, int * sizePtr);
+EXTERN int		Tcl_DictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				int *sizePtr);
 #endif
 #ifndef Tcl_DictObjFirst_TCL_DECLARED
 #define Tcl_DictObjFirst_TCL_DECLARED
 /* 498 */
-EXTERN int		Tcl_DictObjFirst (Tcl_Interp * interp,
-				Tcl_Obj * dictPtr,
-				Tcl_DictSearch * searchPtr,
-				Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr,
-				int * donePtr);
+EXTERN int		Tcl_DictObjFirst(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr,
+				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
+				int *donePtr);
 #endif
 #ifndef Tcl_DictObjNext_TCL_DECLARED
 #define Tcl_DictObjNext_TCL_DECLARED
 /* 499 */
-EXTERN void		Tcl_DictObjNext (Tcl_DictSearch * searchPtr,
-				Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr,
-				int * donePtr);
+EXTERN void		Tcl_DictObjNext(Tcl_DictSearch *searchPtr,
+				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
+				int *donePtr);
 #endif
 #ifndef Tcl_DictObjDone_TCL_DECLARED
 #define Tcl_DictObjDone_TCL_DECLARED
 /* 500 */
-EXTERN void		Tcl_DictObjDone (Tcl_DictSearch * searchPtr);
+EXTERN void		Tcl_DictObjDone(Tcl_DictSearch *searchPtr);
 #endif
 #ifndef Tcl_DictObjPutKeyList_TCL_DECLARED
 #define Tcl_DictObjPutKeyList_TCL_DECLARED
 /* 501 */
-EXTERN int		Tcl_DictObjPutKeyList (Tcl_Interp * interp,
-				Tcl_Obj * dictPtr, int keyc,
-				Tcl_Obj *const * keyv, Tcl_Obj * valuePtr);
+EXTERN int		Tcl_DictObjPutKeyList(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, int keyc,
+				Tcl_Obj *const *keyv, Tcl_Obj *valuePtr);
 #endif
 #ifndef Tcl_DictObjRemoveKeyList_TCL_DECLARED
 #define Tcl_DictObjRemoveKeyList_TCL_DECLARED
 /* 502 */
-EXTERN int		Tcl_DictObjRemoveKeyList (Tcl_Interp * interp,
-				Tcl_Obj * dictPtr, int keyc,
-				Tcl_Obj *const * keyv);
+EXTERN int		Tcl_DictObjRemoveKeyList(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, int keyc,
+				Tcl_Obj *const *keyv);
 #endif
 #ifndef Tcl_NewDictObj_TCL_DECLARED
 #define Tcl_NewDictObj_TCL_DECLARED
 /* 503 */
-EXTERN Tcl_Obj *	Tcl_NewDictObj (void);
+EXTERN Tcl_Obj *	Tcl_NewDictObj(void);
 #endif
 #ifndef Tcl_DbNewDictObj_TCL_DECLARED
 #define Tcl_DbNewDictObj_TCL_DECLARED
 /* 504 */
-EXTERN Tcl_Obj *	Tcl_DbNewDictObj (const char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewDictObj(const char *file, int line);
 #endif
 #ifndef Tcl_RegisterConfig_TCL_DECLARED
 #define Tcl_RegisterConfig_TCL_DECLARED
 /* 505 */
-EXTERN void		Tcl_RegisterConfig (Tcl_Interp * interp,
-				const char * pkgName,
-				const Tcl_Config * configuration,
-				const char * valEncoding);
+EXTERN void		Tcl_RegisterConfig(Tcl_Interp *interp,
+				const char *pkgName,
+				const Tcl_Config *configuration,
+				const char *valEncoding);
 #endif
 #ifndef Tcl_CreateNamespace_TCL_DECLARED
 #define Tcl_CreateNamespace_TCL_DECLARED
 /* 506 */
-EXTERN Tcl_Namespace *	Tcl_CreateNamespace (Tcl_Interp * interp,
-				const char * name, ClientData clientData,
-				Tcl_NamespaceDeleteProc * deleteProc);
+EXTERN Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
+				const char *name, ClientData clientData,
+				Tcl_NamespaceDeleteProc *deleteProc);
 #endif
 #ifndef Tcl_DeleteNamespace_TCL_DECLARED
 #define Tcl_DeleteNamespace_TCL_DECLARED
 /* 507 */
-EXTERN void		Tcl_DeleteNamespace (Tcl_Namespace * nsPtr);
+EXTERN void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
 #endif
 #ifndef Tcl_AppendExportList_TCL_DECLARED
 #define Tcl_AppendExportList_TCL_DECLARED
 /* 508 */
-EXTERN int		Tcl_AppendExportList (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr, Tcl_Obj * objPtr);
+EXTERN int		Tcl_AppendExportList(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_Export_TCL_DECLARED
 #define Tcl_Export_TCL_DECLARED
 /* 509 */
-EXTERN int		Tcl_Export (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr, const char * pattern,
-				int resetListFirst);
+EXTERN int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int resetListFirst);
 #endif
 #ifndef Tcl_Import_TCL_DECLARED
 #define Tcl_Import_TCL_DECLARED
 /* 510 */
-EXTERN int		Tcl_Import (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr, const char * pattern,
-				int allowOverwrite);
+EXTERN int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int allowOverwrite);
 #endif
 #ifndef Tcl_ForgetImport_TCL_DECLARED
 #define Tcl_ForgetImport_TCL_DECLARED
 /* 511 */
-EXTERN int		Tcl_ForgetImport (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr, const char * pattern);
+EXTERN int		Tcl_ForgetImport(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, const char *pattern);
 #endif
 #ifndef Tcl_GetCurrentNamespace_TCL_DECLARED
 #define Tcl_GetCurrentNamespace_TCL_DECLARED
 /* 512 */
-EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace (Tcl_Interp * interp);
+EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_GetGlobalNamespace_TCL_DECLARED
 #define Tcl_GetGlobalNamespace_TCL_DECLARED
 /* 513 */
-EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace (Tcl_Interp * interp);
+EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_FindNamespace_TCL_DECLARED
 #define Tcl_FindNamespace_TCL_DECLARED
 /* 514 */
-EXTERN Tcl_Namespace *	Tcl_FindNamespace (Tcl_Interp * interp,
-				const char * name,
-				Tcl_Namespace * contextNsPtr, int flags);
+EXTERN Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
 #endif
 #ifndef Tcl_FindCommand_TCL_DECLARED
 #define Tcl_FindCommand_TCL_DECLARED
 /* 515 */
-EXTERN Tcl_Command	Tcl_FindCommand (Tcl_Interp * interp,
-				const char * name,
-				Tcl_Namespace * contextNsPtr, int flags);
+EXTERN Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
 #endif
 #ifndef Tcl_GetCommandFromObj_TCL_DECLARED
 #define Tcl_GetCommandFromObj_TCL_DECLARED
 /* 516 */
-EXTERN Tcl_Command	Tcl_GetCommandFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr);
+EXTERN Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetCommandFullName_TCL_DECLARED
 #define Tcl_GetCommandFullName_TCL_DECLARED
 /* 517 */
-EXTERN void		Tcl_GetCommandFullName (Tcl_Interp * interp,
-				Tcl_Command command, Tcl_Obj * objPtr);
+EXTERN void		Tcl_GetCommandFullName(Tcl_Interp *interp,
+				Tcl_Command command, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_FSEvalFileEx_TCL_DECLARED
 #define Tcl_FSEvalFileEx_TCL_DECLARED
 /* 518 */
-EXTERN int		Tcl_FSEvalFileEx (Tcl_Interp * interp,
-				Tcl_Obj * fileName,
-				const char * encodingName);
+EXTERN int		Tcl_FSEvalFileEx(Tcl_Interp *interp,
+				Tcl_Obj *fileName, const char *encodingName);
 #endif
 #ifndef Tcl_SetExitProc_TCL_DECLARED
 #define Tcl_SetExitProc_TCL_DECLARED
 /* 519 */
-EXTERN Tcl_ExitProc *	Tcl_SetExitProc (Tcl_ExitProc * proc);
+EXTERN Tcl_ExitProc *	Tcl_SetExitProc(Tcl_ExitProc *proc);
 #endif
 #ifndef Tcl_LimitAddHandler_TCL_DECLARED
 #define Tcl_LimitAddHandler_TCL_DECLARED
 /* 520 */
-EXTERN void		Tcl_LimitAddHandler (Tcl_Interp * interp, int type,
-				Tcl_LimitHandlerProc * handlerProc,
+EXTERN void		Tcl_LimitAddHandler(Tcl_Interp *interp, int type,
+				Tcl_LimitHandlerProc *handlerProc,
 				ClientData clientData,
-				Tcl_LimitHandlerDeleteProc * deleteProc);
+				Tcl_LimitHandlerDeleteProc *deleteProc);
 #endif
 #ifndef Tcl_LimitRemoveHandler_TCL_DECLARED
 #define Tcl_LimitRemoveHandler_TCL_DECLARED
 /* 521 */
-EXTERN void		Tcl_LimitRemoveHandler (Tcl_Interp * interp,
-				int type, Tcl_LimitHandlerProc * handlerProc,
+EXTERN void		Tcl_LimitRemoveHandler(Tcl_Interp *interp, int type,
+				Tcl_LimitHandlerProc *handlerProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_LimitReady_TCL_DECLARED
 #define Tcl_LimitReady_TCL_DECLARED
 /* 522 */
-EXTERN int		Tcl_LimitReady (Tcl_Interp * interp);
+EXTERN int		Tcl_LimitReady(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_LimitCheck_TCL_DECLARED
 #define Tcl_LimitCheck_TCL_DECLARED
 /* 523 */
-EXTERN int		Tcl_LimitCheck (Tcl_Interp * interp);
+EXTERN int		Tcl_LimitCheck(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_LimitExceeded_TCL_DECLARED
 #define Tcl_LimitExceeded_TCL_DECLARED
 /* 524 */
-EXTERN int		Tcl_LimitExceeded (Tcl_Interp * interp);
+EXTERN int		Tcl_LimitExceeded(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_LimitSetCommands_TCL_DECLARED
 #define Tcl_LimitSetCommands_TCL_DECLARED
 /* 525 */
-EXTERN void		Tcl_LimitSetCommands (Tcl_Interp * interp,
+EXTERN void		Tcl_LimitSetCommands(Tcl_Interp *interp,
 				int commandLimit);
 #endif
 #ifndef Tcl_LimitSetTime_TCL_DECLARED
 #define Tcl_LimitSetTime_TCL_DECLARED
 /* 526 */
-EXTERN void		Tcl_LimitSetTime (Tcl_Interp * interp,
-				Tcl_Time * timeLimitPtr);
+EXTERN void		Tcl_LimitSetTime(Tcl_Interp *interp,
+				Tcl_Time *timeLimitPtr);
 #endif
 #ifndef Tcl_LimitSetGranularity_TCL_DECLARED
 #define Tcl_LimitSetGranularity_TCL_DECLARED
 /* 527 */
-EXTERN void		Tcl_LimitSetGranularity (Tcl_Interp * interp,
-				int type, int granularity);
+EXTERN void		Tcl_LimitSetGranularity(Tcl_Interp *interp, int type,
+				int granularity);
 #endif
 #ifndef Tcl_LimitTypeEnabled_TCL_DECLARED
 #define Tcl_LimitTypeEnabled_TCL_DECLARED
 /* 528 */
-EXTERN int		Tcl_LimitTypeEnabled (Tcl_Interp * interp, int type);
+EXTERN int		Tcl_LimitTypeEnabled(Tcl_Interp *interp, int type);
 #endif
 #ifndef Tcl_LimitTypeExceeded_TCL_DECLARED
 #define Tcl_LimitTypeExceeded_TCL_DECLARED
 /* 529 */
-EXTERN int		Tcl_LimitTypeExceeded (Tcl_Interp * interp, int type);
+EXTERN int		Tcl_LimitTypeExceeded(Tcl_Interp *interp, int type);
 #endif
 #ifndef Tcl_LimitTypeSet_TCL_DECLARED
 #define Tcl_LimitTypeSet_TCL_DECLARED
 /* 530 */
-EXTERN void		Tcl_LimitTypeSet (Tcl_Interp * interp, int type);
+EXTERN void		Tcl_LimitTypeSet(Tcl_Interp *interp, int type);
 #endif
 #ifndef Tcl_LimitTypeReset_TCL_DECLARED
 #define Tcl_LimitTypeReset_TCL_DECLARED
 /* 531 */
-EXTERN void		Tcl_LimitTypeReset (Tcl_Interp * interp, int type);
+EXTERN void		Tcl_LimitTypeReset(Tcl_Interp *interp, int type);
 #endif
 #ifndef Tcl_LimitGetCommands_TCL_DECLARED
 #define Tcl_LimitGetCommands_TCL_DECLARED
 /* 532 */
-EXTERN int		Tcl_LimitGetCommands (Tcl_Interp * interp);
+EXTERN int		Tcl_LimitGetCommands(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_LimitGetTime_TCL_DECLARED
 #define Tcl_LimitGetTime_TCL_DECLARED
 /* 533 */
-EXTERN void		Tcl_LimitGetTime (Tcl_Interp * interp,
-				Tcl_Time * timeLimitPtr);
+EXTERN void		Tcl_LimitGetTime(Tcl_Interp *interp,
+				Tcl_Time *timeLimitPtr);
 #endif
 #ifndef Tcl_LimitGetGranularity_TCL_DECLARED
 #define Tcl_LimitGetGranularity_TCL_DECLARED
 /* 534 */
-EXTERN int		Tcl_LimitGetGranularity (Tcl_Interp * interp,
-				int type);
+EXTERN int		Tcl_LimitGetGranularity(Tcl_Interp *interp, int type);
 #endif
 #ifndef Tcl_SaveInterpState_TCL_DECLARED
 #define Tcl_SaveInterpState_TCL_DECLARED
 /* 535 */
-EXTERN Tcl_InterpState	Tcl_SaveInterpState (Tcl_Interp * interp, int status);
+EXTERN Tcl_InterpState	Tcl_SaveInterpState(Tcl_Interp *interp, int status);
 #endif
 #ifndef Tcl_RestoreInterpState_TCL_DECLARED
 #define Tcl_RestoreInterpState_TCL_DECLARED
 /* 536 */
-EXTERN int		Tcl_RestoreInterpState (Tcl_Interp * interp,
+EXTERN int		Tcl_RestoreInterpState(Tcl_Interp *interp,
 				Tcl_InterpState state);
 #endif
 #ifndef Tcl_DiscardInterpState_TCL_DECLARED
 #define Tcl_DiscardInterpState_TCL_DECLARED
 /* 537 */
-EXTERN void		Tcl_DiscardInterpState (Tcl_InterpState state);
+EXTERN void		Tcl_DiscardInterpState(Tcl_InterpState state);
 #endif
 #ifndef Tcl_SetReturnOptions_TCL_DECLARED
 #define Tcl_SetReturnOptions_TCL_DECLARED
 /* 538 */
-EXTERN int		Tcl_SetReturnOptions (Tcl_Interp * interp,
-				Tcl_Obj * options);
+EXTERN int		Tcl_SetReturnOptions(Tcl_Interp *interp,
+				Tcl_Obj *options);
 #endif
 #ifndef Tcl_GetReturnOptions_TCL_DECLARED
 #define Tcl_GetReturnOptions_TCL_DECLARED
 /* 539 */
-EXTERN Tcl_Obj *	Tcl_GetReturnOptions (Tcl_Interp * interp,
-				int result);
+EXTERN Tcl_Obj *	Tcl_GetReturnOptions(Tcl_Interp *interp, int result);
 #endif
 #ifndef Tcl_IsEnsemble_TCL_DECLARED
 #define Tcl_IsEnsemble_TCL_DECLARED
 /* 540 */
-EXTERN int		Tcl_IsEnsemble (Tcl_Command token);
+EXTERN int		Tcl_IsEnsemble(Tcl_Command token);
 #endif
 #ifndef Tcl_CreateEnsemble_TCL_DECLARED
 #define Tcl_CreateEnsemble_TCL_DECLARED
 /* 541 */
-EXTERN Tcl_Command	Tcl_CreateEnsemble (Tcl_Interp * interp,
-				const char * name,
-				Tcl_Namespace * namespacePtr, int flags);
+EXTERN Tcl_Command	Tcl_CreateEnsemble(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *namespacePtr, int flags);
 #endif
 #ifndef Tcl_FindEnsemble_TCL_DECLARED
 #define Tcl_FindEnsemble_TCL_DECLARED
 /* 542 */
-EXTERN Tcl_Command	Tcl_FindEnsemble (Tcl_Interp * interp,
-				Tcl_Obj * cmdNameObj, int flags);
+EXTERN Tcl_Command	Tcl_FindEnsemble(Tcl_Interp *interp,
+				Tcl_Obj *cmdNameObj, int flags);
 #endif
 #ifndef Tcl_SetEnsembleSubcommandList_TCL_DECLARED
 #define Tcl_SetEnsembleSubcommandList_TCL_DECLARED
 /* 543 */
-EXTERN int		Tcl_SetEnsembleSubcommandList (Tcl_Interp * interp,
-				Tcl_Command token, Tcl_Obj * subcmdList);
+EXTERN int		Tcl_SetEnsembleSubcommandList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *subcmdList);
 #endif
 #ifndef Tcl_SetEnsembleMappingDict_TCL_DECLARED
 #define Tcl_SetEnsembleMappingDict_TCL_DECLARED
 /* 544 */
-EXTERN int		Tcl_SetEnsembleMappingDict (Tcl_Interp * interp,
-				Tcl_Command token, Tcl_Obj * mapDict);
+EXTERN int		Tcl_SetEnsembleMappingDict(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *mapDict);
 #endif
 #ifndef Tcl_SetEnsembleUnknownHandler_TCL_DECLARED
 #define Tcl_SetEnsembleUnknownHandler_TCL_DECLARED
 /* 545 */
-EXTERN int		Tcl_SetEnsembleUnknownHandler (Tcl_Interp * interp,
-				Tcl_Command token, Tcl_Obj * unknownList);
+EXTERN int		Tcl_SetEnsembleUnknownHandler(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *unknownList);
 #endif
 #ifndef Tcl_SetEnsembleFlags_TCL_DECLARED
 #define Tcl_SetEnsembleFlags_TCL_DECLARED
 /* 546 */
-EXTERN int		Tcl_SetEnsembleFlags (Tcl_Interp * interp,
+EXTERN int		Tcl_SetEnsembleFlags(Tcl_Interp *interp,
 				Tcl_Command token, int flags);
 #endif
 #ifndef Tcl_GetEnsembleSubcommandList_TCL_DECLARED
 #define Tcl_GetEnsembleSubcommandList_TCL_DECLARED
 /* 547 */
-EXTERN int		Tcl_GetEnsembleSubcommandList (Tcl_Interp * interp,
-				Tcl_Command token, Tcl_Obj ** subcmdListPtr);
+EXTERN int		Tcl_GetEnsembleSubcommandList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **subcmdListPtr);
 #endif
 #ifndef Tcl_GetEnsembleMappingDict_TCL_DECLARED
 #define Tcl_GetEnsembleMappingDict_TCL_DECLARED
 /* 548 */
-EXTERN int		Tcl_GetEnsembleMappingDict (Tcl_Interp * interp,
-				Tcl_Command token, Tcl_Obj ** mapDictPtr);
+EXTERN int		Tcl_GetEnsembleMappingDict(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **mapDictPtr);
 #endif
 #ifndef Tcl_GetEnsembleUnknownHandler_TCL_DECLARED
 #define Tcl_GetEnsembleUnknownHandler_TCL_DECLARED
 /* 549 */
-EXTERN int		Tcl_GetEnsembleUnknownHandler (Tcl_Interp * interp,
-				Tcl_Command token, Tcl_Obj ** unknownListPtr);
+EXTERN int		Tcl_GetEnsembleUnknownHandler(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **unknownListPtr);
 #endif
 #ifndef Tcl_GetEnsembleFlags_TCL_DECLARED
 #define Tcl_GetEnsembleFlags_TCL_DECLARED
 /* 550 */
-EXTERN int		Tcl_GetEnsembleFlags (Tcl_Interp * interp,
-				Tcl_Command token, int * flagsPtr);
+EXTERN int		Tcl_GetEnsembleFlags(Tcl_Interp *interp,
+				Tcl_Command token, int *flagsPtr);
 #endif
 #ifndef Tcl_GetEnsembleNamespace_TCL_DECLARED
 #define Tcl_GetEnsembleNamespace_TCL_DECLARED
 /* 551 */
-EXTERN int		Tcl_GetEnsembleNamespace (Tcl_Interp * interp,
+EXTERN int		Tcl_GetEnsembleNamespace(Tcl_Interp *interp,
 				Tcl_Command token,
-				Tcl_Namespace ** namespacePtrPtr);
+				Tcl_Namespace **namespacePtrPtr);
 #endif
 #ifndef Tcl_SetTimeProc_TCL_DECLARED
 #define Tcl_SetTimeProc_TCL_DECLARED
 /* 552 */
-EXTERN void		Tcl_SetTimeProc (Tcl_GetTimeProc * getProc,
-				Tcl_ScaleTimeProc * scaleProc,
+EXTERN void		Tcl_SetTimeProc(Tcl_GetTimeProc *getProc,
+				Tcl_ScaleTimeProc *scaleProc,
 				ClientData clientData);
 #endif
 #ifndef Tcl_QueryTimeProc_TCL_DECLARED
 #define Tcl_QueryTimeProc_TCL_DECLARED
 /* 553 */
-EXTERN void		Tcl_QueryTimeProc (Tcl_GetTimeProc ** getProc,
-				Tcl_ScaleTimeProc ** scaleProc,
-				ClientData * clientData);
+EXTERN void		Tcl_QueryTimeProc(Tcl_GetTimeProc **getProc,
+				Tcl_ScaleTimeProc **scaleProc,
+				ClientData *clientData);
 #endif
 #ifndef Tcl_ChannelThreadActionProc_TCL_DECLARED
 #define Tcl_ChannelThreadActionProc_TCL_DECLARED
 /* 554 */
-EXTERN Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_NewBignumObj_TCL_DECLARED
 #define Tcl_NewBignumObj_TCL_DECLARED
 /* 555 */
-EXTERN Tcl_Obj *	Tcl_NewBignumObj (mp_int * value);
+EXTERN Tcl_Obj *	Tcl_NewBignumObj(mp_int *value);
 #endif
 #ifndef Tcl_DbNewBignumObj_TCL_DECLARED
 #define Tcl_DbNewBignumObj_TCL_DECLARED
 /* 556 */
-EXTERN Tcl_Obj *	Tcl_DbNewBignumObj (mp_int * value,
-				const char * file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewBignumObj(mp_int *value, const char *file,
+				int line);
 #endif
 #ifndef Tcl_SetBignumObj_TCL_DECLARED
 #define Tcl_SetBignumObj_TCL_DECLARED
 /* 557 */
-EXTERN void		Tcl_SetBignumObj (Tcl_Obj * obj, mp_int * value);
+EXTERN void		Tcl_SetBignumObj(Tcl_Obj *obj, mp_int *value);
 #endif
 #ifndef Tcl_GetBignumFromObj_TCL_DECLARED
 #define Tcl_GetBignumFromObj_TCL_DECLARED
 /* 558 */
-EXTERN int		Tcl_GetBignumFromObj (Tcl_Interp * interp,
-				Tcl_Obj * obj, mp_int * value);
+EXTERN int		Tcl_GetBignumFromObj(Tcl_Interp *interp,
+				Tcl_Obj *obj, mp_int *value);
 #endif
 #ifndef Tcl_TakeBignumFromObj_TCL_DECLARED
 #define Tcl_TakeBignumFromObj_TCL_DECLARED
 /* 559 */
-EXTERN int		Tcl_TakeBignumFromObj (Tcl_Interp * interp,
-				Tcl_Obj * obj, mp_int * value);
+EXTERN int		Tcl_TakeBignumFromObj(Tcl_Interp *interp,
+				Tcl_Obj *obj, mp_int *value);
 #endif
 #ifndef Tcl_TruncateChannel_TCL_DECLARED
 #define Tcl_TruncateChannel_TCL_DECLARED
 /* 560 */
-EXTERN int		Tcl_TruncateChannel (Tcl_Channel chan,
+EXTERN int		Tcl_TruncateChannel(Tcl_Channel chan,
 				Tcl_WideInt length);
 #endif
 #ifndef Tcl_ChannelTruncateProc_TCL_DECLARED
 #define Tcl_ChannelTruncateProc_TCL_DECLARED
 /* 561 */
-EXTERN Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc (
-				const Tcl_ChannelType * chanTypePtr);
+EXTERN Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc(
+				const Tcl_ChannelType *chanTypePtr);
 #endif
 #ifndef Tcl_SetChannelErrorInterp_TCL_DECLARED
 #define Tcl_SetChannelErrorInterp_TCL_DECLARED
 /* 562 */
-EXTERN void		Tcl_SetChannelErrorInterp (Tcl_Interp * interp,
-				Tcl_Obj * msg);
+EXTERN void		Tcl_SetChannelErrorInterp(Tcl_Interp *interp,
+				Tcl_Obj *msg);
 #endif
 #ifndef Tcl_GetChannelErrorInterp_TCL_DECLARED
 #define Tcl_GetChannelErrorInterp_TCL_DECLARED
 /* 563 */
-EXTERN void		Tcl_GetChannelErrorInterp (Tcl_Interp * interp,
-				Tcl_Obj ** msg);
+EXTERN void		Tcl_GetChannelErrorInterp(Tcl_Interp *interp,
+				Tcl_Obj **msg);
 #endif
 #ifndef Tcl_SetChannelError_TCL_DECLARED
 #define Tcl_SetChannelError_TCL_DECLARED
 /* 564 */
-EXTERN void		Tcl_SetChannelError (Tcl_Channel chan, Tcl_Obj * msg);
+EXTERN void		Tcl_SetChannelError(Tcl_Channel chan, Tcl_Obj *msg);
 #endif
 #ifndef Tcl_GetChannelError_TCL_DECLARED
 #define Tcl_GetChannelError_TCL_DECLARED
 /* 565 */
-EXTERN void		Tcl_GetChannelError (Tcl_Channel chan,
-				Tcl_Obj ** msg);
+EXTERN void		Tcl_GetChannelError(Tcl_Channel chan, Tcl_Obj **msg);
 #endif
 #ifndef Tcl_InitBignumFromDouble_TCL_DECLARED
 #define Tcl_InitBignumFromDouble_TCL_DECLARED
 /* 566 */
-EXTERN int		Tcl_InitBignumFromDouble (Tcl_Interp * interp,
-				double initval, mp_int * toInit);
+EXTERN int		Tcl_InitBignumFromDouble(Tcl_Interp *interp,
+				double initval, mp_int *toInit);
 #endif
 #ifndef Tcl_GetNamespaceUnknownHandler_TCL_DECLARED
 #define Tcl_GetNamespaceUnknownHandler_TCL_DECLARED
 /* 567 */
-EXTERN Tcl_Obj *	Tcl_GetNamespaceUnknownHandler (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr);
+EXTERN Tcl_Obj *	Tcl_GetNamespaceUnknownHandler(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr);
 #endif
 #ifndef Tcl_SetNamespaceUnknownHandler_TCL_DECLARED
 #define Tcl_SetNamespaceUnknownHandler_TCL_DECLARED
 /* 568 */
-EXTERN int		Tcl_SetNamespaceUnknownHandler (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr, Tcl_Obj * handlerPtr);
+EXTERN int		Tcl_SetNamespaceUnknownHandler(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr);
 #endif
 #ifndef Tcl_GetEncodingFromObj_TCL_DECLARED
 #define Tcl_GetEncodingFromObj_TCL_DECLARED
 /* 569 */
-EXTERN int		Tcl_GetEncodingFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, Tcl_Encoding * encodingPtr);
+EXTERN int		Tcl_GetEncodingFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr);
 #endif
 #ifndef Tcl_GetEncodingSearchPath_TCL_DECLARED
 #define Tcl_GetEncodingSearchPath_TCL_DECLARED
 /* 570 */
-EXTERN Tcl_Obj *	Tcl_GetEncodingSearchPath (void);
+EXTERN Tcl_Obj *	Tcl_GetEncodingSearchPath(void);
 #endif
 #ifndef Tcl_SetEncodingSearchPath_TCL_DECLARED
 #define Tcl_SetEncodingSearchPath_TCL_DECLARED
 /* 571 */
-EXTERN int		Tcl_SetEncodingSearchPath (Tcl_Obj * searchPath);
+EXTERN int		Tcl_SetEncodingSearchPath(Tcl_Obj *searchPath);
 #endif
 #ifndef Tcl_GetEncodingNameFromEnvironment_TCL_DECLARED
 #define Tcl_GetEncodingNameFromEnvironment_TCL_DECLARED
 /* 572 */
-EXTERN const char *	Tcl_GetEncodingNameFromEnvironment (
-				Tcl_DString * bufPtr);
+EXTERN const char *	Tcl_GetEncodingNameFromEnvironment(
+				Tcl_DString *bufPtr);
 #endif
 #ifndef Tcl_PkgRequireProc_TCL_DECLARED
 #define Tcl_PkgRequireProc_TCL_DECLARED
 /* 573 */
-EXTERN int		Tcl_PkgRequireProc (Tcl_Interp * interp,
-				const char * name, int objc,
+EXTERN int		Tcl_PkgRequireProc(Tcl_Interp *interp,
+				const char *name, int objc,
 				Tcl_Obj *const objv[],
-				ClientData * clientDataPtr);
+				ClientData *clientDataPtr);
 #endif
 #ifndef Tcl_AppendObjToErrorInfo_TCL_DECLARED
 #define Tcl_AppendObjToErrorInfo_TCL_DECLARED
 /* 574 */
-EXTERN void		Tcl_AppendObjToErrorInfo (Tcl_Interp * interp,
-				Tcl_Obj * objPtr);
+EXTERN void		Tcl_AppendObjToErrorInfo(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_AppendLimitedToObj_TCL_DECLARED
 #define Tcl_AppendLimitedToObj_TCL_DECLARED
 /* 575 */
-EXTERN void		Tcl_AppendLimitedToObj (Tcl_Obj * objPtr,
-				const char * bytes, int length, int limit,
-				const char * ellipsis);
+EXTERN void		Tcl_AppendLimitedToObj(Tcl_Obj *objPtr,
+				const char *bytes, int length, int limit,
+				const char *ellipsis);
 #endif
 #ifndef Tcl_Format_TCL_DECLARED
 #define Tcl_Format_TCL_DECLARED
 /* 576 */
-EXTERN Tcl_Obj *	Tcl_Format (Tcl_Interp * interp, const char * format,
+EXTERN Tcl_Obj *	Tcl_Format(Tcl_Interp *interp, const char *format,
 				int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_AppendFormatToObj_TCL_DECLARED
 #define Tcl_AppendFormatToObj_TCL_DECLARED
 /* 577 */
-EXTERN int		Tcl_AppendFormatToObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, const char * format,
+EXTERN int		Tcl_AppendFormatToObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const char *format,
 				int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_ObjPrintf_TCL_DECLARED
 #define Tcl_ObjPrintf_TCL_DECLARED
 /* 578 */
-EXTERN Tcl_Obj *	Tcl_ObjPrintf (const char * format, ...);
+EXTERN Tcl_Obj *	Tcl_ObjPrintf(const char *format, ...);
 #endif
 #ifndef Tcl_AppendPrintfToObj_TCL_DECLARED
 #define Tcl_AppendPrintfToObj_TCL_DECLARED
 /* 579 */
-EXTERN void		Tcl_AppendPrintfToObj (Tcl_Obj * objPtr,
-				const char * format, ...);
+EXTERN void		Tcl_AppendPrintfToObj(Tcl_Obj *objPtr,
+				const char *format, ...);
 #endif
 #ifndef Tcl_CancelEval_TCL_DECLARED
 #define Tcl_CancelEval_TCL_DECLARED
 /* 580 */
-EXTERN int		Tcl_CancelEval (Tcl_Interp * interp,
-				Tcl_Obj * resultObjPtr,
-				ClientData clientData, int flags);
+EXTERN int		Tcl_CancelEval(Tcl_Interp *interp,
+				Tcl_Obj *resultObjPtr, ClientData clientData,
+				int flags);
 #endif
 #ifndef Tcl_Canceled_TCL_DECLARED
 #define Tcl_Canceled_TCL_DECLARED
 /* 581 */
-EXTERN int		Tcl_Canceled (Tcl_Interp * interp, int flags);
+EXTERN int		Tcl_Canceled(Tcl_Interp *interp, int flags);
 #endif
 #ifndef Tcl_CreatePipe_TCL_DECLARED
 #define Tcl_CreatePipe_TCL_DECLARED
 /* 582 */
-EXTERN int		Tcl_CreatePipe (Tcl_Interp * interp,
-				Tcl_Channel * rchan, Tcl_Channel * wchan,
+EXTERN int		Tcl_CreatePipe(Tcl_Interp *interp,
+				Tcl_Channel *rchan, Tcl_Channel *wchan,
 				int flags);
 #endif
 #ifndef Tcl_NRCreateCommand_TCL_DECLARED
 #define Tcl_NRCreateCommand_TCL_DECLARED
 /* 583 */
-EXTERN Tcl_Command	Tcl_NRCreateCommand (Tcl_Interp * interp,
-				const char * cmdName, Tcl_ObjCmdProc * proc,
-				Tcl_ObjCmdProc * nreProc,
+EXTERN Tcl_Command	Tcl_NRCreateCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc *proc,
+				Tcl_ObjCmdProc *nreProc,
 				ClientData clientData,
-				Tcl_CmdDeleteProc * deleteProc);
+				Tcl_CmdDeleteProc *deleteProc);
 #endif
 #ifndef Tcl_NREvalObj_TCL_DECLARED
 #define Tcl_NREvalObj_TCL_DECLARED
 /* 584 */
-EXTERN int		Tcl_NREvalObj (Tcl_Interp * interp, Tcl_Obj * objPtr,
+EXTERN int		Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags);
 #endif
 #ifndef Tcl_NREvalObjv_TCL_DECLARED
 #define Tcl_NREvalObjv_TCL_DECLARED
 /* 585 */
-EXTERN int		Tcl_NREvalObjv (Tcl_Interp * interp, int objc,
+EXTERN int		Tcl_NREvalObjv(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], int flags);
 #endif
 #ifndef Tcl_NRCmdSwap_TCL_DECLARED
 #define Tcl_NRCmdSwap_TCL_DECLARED
 /* 586 */
-EXTERN int		Tcl_NRCmdSwap (Tcl_Interp * interp, Tcl_Command cmd,
+EXTERN int		Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd,
 				int objc, Tcl_Obj *const objv[], int flags);
 #endif
 #ifndef Tcl_NRAddCallback_TCL_DECLARED
 #define Tcl_NRAddCallback_TCL_DECLARED
 /* 587 */
-EXTERN void		Tcl_NRAddCallback (Tcl_Interp * interp,
-				Tcl_NRPostProc * postProcPtr,
+EXTERN void		Tcl_NRAddCallback(Tcl_Interp *interp,
+				Tcl_NRPostProc *postProcPtr,
 				ClientData data0, ClientData data1,
 				ClientData data2, ClientData data3);
 #endif
 #ifndef Tcl_NRCallObjProc_TCL_DECLARED
 #define Tcl_NRCallObjProc_TCL_DECLARED
 /* 588 */
-EXTERN int		Tcl_NRCallObjProc (Tcl_Interp * interp,
-				Tcl_ObjCmdProc * objProc,
+EXTERN int		Tcl_NRCallObjProc(Tcl_Interp *interp,
+				Tcl_ObjCmdProc *objProc,
 				ClientData clientData, int objc,
 				Tcl_Obj *const objv[]);
 #endif
 #ifndef Tcl_GetFSDeviceFromStat_TCL_DECLARED
 #define Tcl_GetFSDeviceFromStat_TCL_DECLARED
 /* 589 */
-EXTERN unsigned		Tcl_GetFSDeviceFromStat (const Tcl_StatBuf * statPtr);
+EXTERN unsigned		Tcl_GetFSDeviceFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetFSInodeFromStat_TCL_DECLARED
 #define Tcl_GetFSInodeFromStat_TCL_DECLARED
 /* 590 */
-EXTERN unsigned		Tcl_GetFSInodeFromStat (const Tcl_StatBuf * statPtr);
+EXTERN unsigned		Tcl_GetFSInodeFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetModeFromStat_TCL_DECLARED
 #define Tcl_GetModeFromStat_TCL_DECLARED
 /* 591 */
-EXTERN unsigned		Tcl_GetModeFromStat (const Tcl_StatBuf * statPtr);
+EXTERN unsigned		Tcl_GetModeFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetLinkCountFromStat_TCL_DECLARED
 #define Tcl_GetLinkCountFromStat_TCL_DECLARED
 /* 592 */
-EXTERN int		Tcl_GetLinkCountFromStat (
-				const Tcl_StatBuf * statPtr);
+EXTERN int		Tcl_GetLinkCountFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetUserIdFromStat_TCL_DECLARED
 #define Tcl_GetUserIdFromStat_TCL_DECLARED
 /* 593 */
-EXTERN int		Tcl_GetUserIdFromStat (const Tcl_StatBuf * statPtr);
+EXTERN int		Tcl_GetUserIdFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetGroupIdFromStat_TCL_DECLARED
 #define Tcl_GetGroupIdFromStat_TCL_DECLARED
 /* 594 */
-EXTERN int		Tcl_GetGroupIdFromStat (const Tcl_StatBuf * statPtr);
+EXTERN int		Tcl_GetGroupIdFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetDeviceTypeFromStat_TCL_DECLARED
 #define Tcl_GetDeviceTypeFromStat_TCL_DECLARED
 /* 595 */
-EXTERN int		Tcl_GetDeviceTypeFromStat (
-				const Tcl_StatBuf * statPtr);
+EXTERN int		Tcl_GetDeviceTypeFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetAccessTimeFromStat_TCL_DECLARED
 #define Tcl_GetAccessTimeFromStat_TCL_DECLARED
 /* 596 */
-EXTERN Tcl_WideInt	Tcl_GetAccessTimeFromStat (
-				const Tcl_StatBuf * statPtr);
+EXTERN Tcl_WideInt	Tcl_GetAccessTimeFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetModificationTimeFromStat_TCL_DECLARED
 #define Tcl_GetModificationTimeFromStat_TCL_DECLARED
 /* 597 */
-EXTERN Tcl_WideInt	Tcl_GetModificationTimeFromStat (
-				const Tcl_StatBuf * statPtr);
+EXTERN Tcl_WideInt	Tcl_GetModificationTimeFromStat(
+				const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetChangeTimeFromStat_TCL_DECLARED
 #define Tcl_GetChangeTimeFromStat_TCL_DECLARED
 /* 598 */
-EXTERN Tcl_WideInt	Tcl_GetChangeTimeFromStat (
-				const Tcl_StatBuf * statPtr);
+EXTERN Tcl_WideInt	Tcl_GetChangeTimeFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetSizeFromStat_TCL_DECLARED
 #define Tcl_GetSizeFromStat_TCL_DECLARED
 /* 599 */
-EXTERN Tcl_WideUInt	Tcl_GetSizeFromStat (const Tcl_StatBuf * statPtr);
+EXTERN Tcl_WideUInt	Tcl_GetSizeFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetBlocksFromStat_TCL_DECLARED
 #define Tcl_GetBlocksFromStat_TCL_DECLARED
 /* 600 */
-EXTERN Tcl_WideUInt	Tcl_GetBlocksFromStat (const Tcl_StatBuf * statPtr);
+EXTERN Tcl_WideUInt	Tcl_GetBlocksFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_GetBlockSizeFromStat_TCL_DECLARED
 #define Tcl_GetBlockSizeFromStat_TCL_DECLARED
 /* 601 */
-EXTERN unsigned		Tcl_GetBlockSizeFromStat (
-				const Tcl_StatBuf * statPtr);
+EXTERN unsigned		Tcl_GetBlockSizeFromStat(const Tcl_StatBuf *statPtr);
 #endif
 #ifndef Tcl_SetEnsembleParameterList_TCL_DECLARED
 #define Tcl_SetEnsembleParameterList_TCL_DECLARED
 /* 602 */
-EXTERN int		Tcl_SetEnsembleParameterList (Tcl_Interp * interp,
-				Tcl_Command token, Tcl_Obj * paramList);
+EXTERN int		Tcl_SetEnsembleParameterList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *paramList);
 #endif
 #ifndef Tcl_GetEnsembleParameterList_TCL_DECLARED
 #define Tcl_GetEnsembleParameterList_TCL_DECLARED
 /* 603 */
-EXTERN int		Tcl_GetEnsembleParameterList (Tcl_Interp * interp,
-				Tcl_Command token, Tcl_Obj ** paramListPtr);
+EXTERN int		Tcl_GetEnsembleParameterList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **paramListPtr);
 #endif
 #ifndef Tcl_ParseArgsObjv_TCL_DECLARED
 #define Tcl_ParseArgsObjv_TCL_DECLARED
 /* 604 */
-EXTERN int		Tcl_ParseArgsObjv (Tcl_Interp * interp,
-				const Tcl_ArgvInfo * argTable, int * objcPtr,
-				Tcl_Obj *const * objv, Tcl_Obj *** remObjv);
+EXTERN int		Tcl_ParseArgsObjv(Tcl_Interp *interp,
+				const Tcl_ArgvInfo *argTable, int *objcPtr,
+				Tcl_Obj *const *objv, Tcl_Obj ***remObjv);
 #endif
 #ifndef Tcl_GetErrorLine_TCL_DECLARED
 #define Tcl_GetErrorLine_TCL_DECLARED
 /* 605 */
-EXTERN int		Tcl_GetErrorLine (Tcl_Interp * interp);
+EXTERN int		Tcl_GetErrorLine(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_SetErrorLine_TCL_DECLARED
 #define Tcl_SetErrorLine_TCL_DECLARED
 /* 606 */
-EXTERN void		Tcl_SetErrorLine (Tcl_Interp * interp, int lineNum);
+EXTERN void		Tcl_SetErrorLine(Tcl_Interp *interp, int lineNum);
 #endif
 #ifndef Tcl_TransferResult_TCL_DECLARED
 #define Tcl_TransferResult_TCL_DECLARED
 /* 607 */
-EXTERN void		Tcl_TransferResult (Tcl_Interp * sourceInterp,
-				int result, Tcl_Interp * targetInterp);
+EXTERN void		Tcl_TransferResult(Tcl_Interp *sourceInterp,
+				int result, Tcl_Interp *targetInterp);
 #endif
 #ifndef Tcl_InterpActive_TCL_DECLARED
 #define Tcl_InterpActive_TCL_DECLARED
 /* 608 */
-EXTERN int		Tcl_InterpActive (Tcl_Interp * interp);
+EXTERN int		Tcl_InterpActive(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_BackgroundException_TCL_DECLARED
 #define Tcl_BackgroundException_TCL_DECLARED
 /* 609 */
-EXTERN void		Tcl_BackgroundException (Tcl_Interp * interp,
-				int code);
+EXTERN void		Tcl_BackgroundException(Tcl_Interp *interp, int code);
 #endif
 #ifndef Tcl_ZlibDeflate_TCL_DECLARED
 #define Tcl_ZlibDeflate_TCL_DECLARED
 /* 610 */
-EXTERN int		Tcl_ZlibDeflate (Tcl_Interp * interp, int format,
-				Tcl_Obj * data, int level,
-				Tcl_Obj * gzipHeaderDictObj);
+EXTERN int		Tcl_ZlibDeflate(Tcl_Interp *interp, int format,
+				Tcl_Obj *data, int level,
+				Tcl_Obj *gzipHeaderDictObj);
 #endif
 #ifndef Tcl_ZlibInflate_TCL_DECLARED
 #define Tcl_ZlibInflate_TCL_DECLARED
 /* 611 */
-EXTERN int		Tcl_ZlibInflate (Tcl_Interp * interp, int format,
-				Tcl_Obj * data, int buffersize,
-				Tcl_Obj * gzipHeaderDictObj);
+EXTERN int		Tcl_ZlibInflate(Tcl_Interp *interp, int format,
+				Tcl_Obj *data, int buffersize,
+				Tcl_Obj *gzipHeaderDictObj);
 #endif
 #ifndef Tcl_ZlibCRC32_TCL_DECLARED
 #define Tcl_ZlibCRC32_TCL_DECLARED
 /* 612 */
-EXTERN unsigned int	Tcl_ZlibCRC32 (unsigned int crc,
-				const unsigned char * buf, int len);
+EXTERN unsigned int	Tcl_ZlibCRC32(unsigned int crc,
+				const unsigned char *buf, int len);
 #endif
 #ifndef Tcl_ZlibAdler32_TCL_DECLARED
 #define Tcl_ZlibAdler32_TCL_DECLARED
 /* 613 */
-EXTERN unsigned int	Tcl_ZlibAdler32 (unsigned int adler,
-				const unsigned char * buf, int len);
+EXTERN unsigned int	Tcl_ZlibAdler32(unsigned int adler,
+				const unsigned char *buf, int len);
 #endif
 #ifndef Tcl_ZlibStreamInit_TCL_DECLARED
 #define Tcl_ZlibStreamInit_TCL_DECLARED
 /* 614 */
-EXTERN int		Tcl_ZlibStreamInit (Tcl_Interp * interp, int mode,
-				int format, int level, Tcl_Obj * dictObj,
-				Tcl_ZlibStream * zshandle);
+EXTERN int		Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode,
+				int format, int level, Tcl_Obj *dictObj,
+				Tcl_ZlibStream *zshandle);
 #endif
 #ifndef Tcl_ZlibStreamGetCommandName_TCL_DECLARED
 #define Tcl_ZlibStreamGetCommandName_TCL_DECLARED
 /* 615 */
-EXTERN Tcl_Obj *	Tcl_ZlibStreamGetCommandName (
-				Tcl_ZlibStream zshandle);
+EXTERN Tcl_Obj *	Tcl_ZlibStreamGetCommandName(Tcl_ZlibStream zshandle);
 #endif
 #ifndef Tcl_ZlibStreamEof_TCL_DECLARED
 #define Tcl_ZlibStreamEof_TCL_DECLARED
 /* 616 */
-EXTERN int		Tcl_ZlibStreamEof (Tcl_ZlibStream zshandle);
+EXTERN int		Tcl_ZlibStreamEof(Tcl_ZlibStream zshandle);
 #endif
 #ifndef Tcl_ZlibStreamChecksum_TCL_DECLARED
 #define Tcl_ZlibStreamChecksum_TCL_DECLARED
 /* 617 */
-EXTERN int		Tcl_ZlibStreamChecksum (Tcl_ZlibStream zshandle);
+EXTERN int		Tcl_ZlibStreamChecksum(Tcl_ZlibStream zshandle);
 #endif
 #ifndef Tcl_ZlibStreamPut_TCL_DECLARED
 #define Tcl_ZlibStreamPut_TCL_DECLARED
 /* 618 */
-EXTERN int		Tcl_ZlibStreamPut (Tcl_ZlibStream zshandle,
-				Tcl_Obj * data, int flush);
+EXTERN int		Tcl_ZlibStreamPut(Tcl_ZlibStream zshandle,
+				Tcl_Obj *data, int flush);
 #endif
 #ifndef Tcl_ZlibStreamGet_TCL_DECLARED
 #define Tcl_ZlibStreamGet_TCL_DECLARED
 /* 619 */
-EXTERN int		Tcl_ZlibStreamGet (Tcl_ZlibStream zshandle,
-				Tcl_Obj * data, int count);
+EXTERN int		Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle,
+				Tcl_Obj *data, int count);
 #endif
 #ifndef Tcl_ZlibStreamClose_TCL_DECLARED
 #define Tcl_ZlibStreamClose_TCL_DECLARED
 /* 620 */
-EXTERN int		Tcl_ZlibStreamClose (Tcl_ZlibStream zshandle);
+EXTERN int		Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle);
 #endif
 #ifndef Tcl_ZlibStreamReset_TCL_DECLARED
 #define Tcl_ZlibStreamReset_TCL_DECLARED
 /* 621 */
-EXTERN int		Tcl_ZlibStreamReset (Tcl_ZlibStream zshandle);
+EXTERN int		Tcl_ZlibStreamReset(Tcl_ZlibStream zshandle);
 #endif
 #ifndef Tcl_SetStartupScript_TCL_DECLARED
 #define Tcl_SetStartupScript_TCL_DECLARED
 /* 622 */
-EXTERN void		Tcl_SetStartupScript (Tcl_Obj * path,
-				const char * encoding);
+EXTERN void		Tcl_SetStartupScript(Tcl_Obj *path,
+				const char *encoding);
 #endif
 #ifndef Tcl_GetStartupScript_TCL_DECLARED
 #define Tcl_GetStartupScript_TCL_DECLARED
 /* 623 */
-EXTERN Tcl_Obj *	Tcl_GetStartupScript (const char ** encodingPtr);
+EXTERN Tcl_Obj *	Tcl_GetStartupScript(const char **encodingPtr);
 #endif
 #ifndef Tcl_CloseEx_TCL_DECLARED
 #define Tcl_CloseEx_TCL_DECLARED
 /* 624 */
-EXTERN int		Tcl_CloseEx (Tcl_Interp * interp, Tcl_Channel chan,
+EXTERN int		Tcl_CloseEx(Tcl_Interp *interp, Tcl_Channel chan,
 				int flags);
 #endif
 #ifndef Tcl_NRExprObj_TCL_DECLARED
 #define Tcl_NRExprObj_TCL_DECLARED
 /* 625 */
-EXTERN int		Tcl_NRExprObj (Tcl_Interp * interp, Tcl_Obj * objPtr,
-				Tcl_Obj * resultPtr);
+EXTERN int		Tcl_NRExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				Tcl_Obj *resultPtr);
 #endif
 #ifndef Tcl_NRSubstObj_TCL_DECLARED
 #define Tcl_NRSubstObj_TCL_DECLARED
 /* 626 */
-EXTERN int		Tcl_NRSubstObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, int flags);
+EXTERN int		Tcl_NRSubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
 #endif
 
 typedef struct TclStubHooks {
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index 67c420f..e419222 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -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: tclIndexObj.c,v 1.53 2009/11/18 21:59:50 nijtmans Exp $
+ * RCS: @(#) $Id: tclIndexObj.c,v 1.54 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -1235,7 +1235,7 @@ Tcl_ParseArgsObjv(
 	    objc--;
 	    break;
 	case TCL_ARGV_FUNC: {
-	    Tcl_ArgvFuncProc handlerProc;
+	    Tcl_ArgvFuncProc *handlerProc;
 	    Tcl_Obj *argObj;
 
 	    if (objc == 0) {
@@ -1243,7 +1243,7 @@ Tcl_ParseArgsObjv(
 	    } else {
 		argObj = objv[srcIndex];
 	    }
-	    handlerProc = (Tcl_ArgvFuncProc) infoPtr->srcPtr;
+	    handlerProc = (Tcl_ArgvFuncProc *) infoPtr->srcPtr;
 	    if (handlerProc(infoPtr->clientData, argObj, infoPtr->dstPtr)) {
 		srcIndex++;
 		objc--;
@@ -1251,9 +1251,9 @@ Tcl_ParseArgsObjv(
 	    break;
 	}
 	case TCL_ARGV_GENFUNC: {
-	    Tcl_ArgvGenFuncProc handlerProc;
+	    Tcl_ArgvGenFuncProc *handlerProc;
 
-	    handlerProc = (Tcl_ArgvGenFuncProc) infoPtr->srcPtr;
+	    handlerProc = (Tcl_ArgvGenFuncProc *) infoPtr->srcPtr;
 	    objc = handlerProc(infoPtr->clientData, interp, objc,
 		    &objv[srcIndex], infoPtr->dstPtr);
 	    if (objc < 0) {
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 478c719..0a62638 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.142 2010/01/22 13:02:50 nijtmans Exp $
+# RCS: @(#) $Id: tclInt.decls,v 1.143 2010/01/29 16:17:20 nijtmans Exp $
 
 library tcl
 
@@ -230,7 +230,7 @@ declare 51 generic {
 #}
 declare 53 generic {
     int TclInvokeObjectCommand(ClientData clientData, Tcl_Interp *interp,
-	    int argc, const char **argv)
+	    int argc, CONST84 char **argv)
 }
 declare 54 generic {
     int TclInvokeStringCommand(ClientData clientData, Tcl_Interp *interp,
@@ -549,7 +549,7 @@ declare 133 generic {
 #   int TclpChdir(const char *dirName)
 #}
 declare 138 generic {
-    const 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,
@@ -561,7 +561,7 @@ declare 138 generic {
 #}
 # This is used by TclX, but should otherwise be considered private
 declare 141 generic {
-    const char *TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
+    CONST84_RETURN char *TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
 }
 declare 142 generic {
     int TclSetByteCodeFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr,
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 36aa1ea..c1da3d4 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -15,7 +15,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.454 2010/01/13 06:46:56 nijtmans Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.455 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #ifndef _TCLINT
@@ -165,13 +165,13 @@ typedef struct Tcl_ResolvedVarInfo {
 } Tcl_ResolvedVarInfo;
 
 typedef int (Tcl_ResolveCompiledVarProc)(Tcl_Interp *interp,
-	const char *name, int length, Tcl_Namespace *context,
+	CONST84 char *name, int length, Tcl_Namespace *context,
 	Tcl_ResolvedVarInfo **rPtr);
 
-typedef int (Tcl_ResolveVarProc)(Tcl_Interp *interp, const char *name,
+typedef int (Tcl_ResolveVarProc)(Tcl_Interp *interp, CONST84 char *name,
 	Tcl_Namespace *context, int flags, Tcl_Var *rPtr);
 
-typedef int (Tcl_ResolveCmdProc)(Tcl_Interp *interp, const char *name,
+typedef int (Tcl_ResolveCmdProc)(Tcl_Interp *interp, CONST84 char *name,
 	Tcl_Namespace *context, int flags, Tcl_Command *rPtr);
 
 typedef struct Tcl_ResolverInfo {
@@ -1261,10 +1261,10 @@ typedef struct ContLineLoc {
  * by [info frame]. Contains a sub-structure for each extra field.
  */
 
-typedef Tcl_Obj *(*GetFrameInfoValueProc)(ClientData clientData);
+typedef Tcl_Obj *(GetFrameInfoValueProc)(ClientData clientData);
 typedef struct {
     const char *name;		/* Name of this field. */
-    GetFrameInfoValueProc proc;	/* Function to generate a Tcl_Obj* from the
+    GetFrameInfoValueProc *proc;	/* Function to generate a Tcl_Obj* from the
 				 * clientData, or just use the clientData
 				 * directly (after casting) if NULL. */
     ClientData clientData;	/* Context for above function, or Tcl_Obj* if
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index a01b938..0ec861b 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.135 2009/12/16 23:26:00 nijtmans Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.136 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -51,72 +51,71 @@
 #ifndef TclAllocateFreeObjects_TCL_DECLARED
 #define TclAllocateFreeObjects_TCL_DECLARED
 /* 3 */
-EXTERN void		TclAllocateFreeObjects (void);
+EXTERN void		TclAllocateFreeObjects(void);
 #endif
 /* Slot 4 is reserved */
 #ifndef TclCleanupChildren_TCL_DECLARED
 #define TclCleanupChildren_TCL_DECLARED
 /* 5 */
-EXTERN int		TclCleanupChildren (Tcl_Interp * interp, int numPids,
-				Tcl_Pid * pidPtr, Tcl_Channel errorChan);
+EXTERN int		TclCleanupChildren(Tcl_Interp *interp, int numPids,
+				Tcl_Pid *pidPtr, Tcl_Channel errorChan);
 #endif
 #ifndef TclCleanupCommand_TCL_DECLARED
 #define TclCleanupCommand_TCL_DECLARED
 /* 6 */
-EXTERN void		TclCleanupCommand (Command * cmdPtr);
+EXTERN void		TclCleanupCommand(Command *cmdPtr);
 #endif
 #ifndef TclCopyAndCollapse_TCL_DECLARED
 #define TclCopyAndCollapse_TCL_DECLARED
 /* 7 */
-EXTERN int		TclCopyAndCollapse (int count, const char * src,
-				char * dst);
+EXTERN int		TclCopyAndCollapse(int count, const char *src,
+				char *dst);
 #endif
 #ifndef TclCopyChannel_TCL_DECLARED
 #define TclCopyChannel_TCL_DECLARED
 /* 8 */
-EXTERN int		TclCopyChannel (Tcl_Interp * interp,
+EXTERN int		TclCopyChannel(Tcl_Interp *interp,
 				Tcl_Channel inChan, Tcl_Channel outChan,
-				int toRead, Tcl_Obj * cmdPtr);
+				int toRead, Tcl_Obj *cmdPtr);
 #endif
 #ifndef TclCreatePipeline_TCL_DECLARED
 #define TclCreatePipeline_TCL_DECLARED
 /* 9 */
-EXTERN int		TclCreatePipeline (Tcl_Interp * interp, int argc,
-				const char ** argv, Tcl_Pid ** pidArrayPtr,
-				TclFile * inPipePtr, TclFile * outPipePtr,
-				TclFile * errFilePtr);
+EXTERN int		TclCreatePipeline(Tcl_Interp *interp, int argc,
+				const char **argv, Tcl_Pid **pidArrayPtr,
+				TclFile *inPipePtr, TclFile *outPipePtr,
+				TclFile *errFilePtr);
 #endif
 #ifndef TclCreateProc_TCL_DECLARED
 #define TclCreateProc_TCL_DECLARED
 /* 10 */
-EXTERN int		TclCreateProc (Tcl_Interp * interp,
-				Namespace * nsPtr, const char * procName,
-				Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr,
-				Proc ** procPtrPtr);
+EXTERN int		TclCreateProc(Tcl_Interp *interp, Namespace *nsPtr,
+				const char *procName, Tcl_Obj *argsPtr,
+				Tcl_Obj *bodyPtr, Proc **procPtrPtr);
 #endif
 #ifndef TclDeleteCompiledLocalVars_TCL_DECLARED
 #define TclDeleteCompiledLocalVars_TCL_DECLARED
 /* 11 */
-EXTERN void		TclDeleteCompiledLocalVars (Interp * iPtr,
-				CallFrame * framePtr);
+EXTERN void		TclDeleteCompiledLocalVars(Interp *iPtr,
+				CallFrame *framePtr);
 #endif
 #ifndef TclDeleteVars_TCL_DECLARED
 #define TclDeleteVars_TCL_DECLARED
 /* 12 */
-EXTERN void		TclDeleteVars (Interp * iPtr,
-				TclVarHashTable * tablePtr);
+EXTERN void		TclDeleteVars(Interp *iPtr,
+				TclVarHashTable *tablePtr);
 #endif
 /* Slot 13 is reserved */
 #ifndef TclDumpMemoryInfo_TCL_DECLARED
 #define TclDumpMemoryInfo_TCL_DECLARED
 /* 14 */
-EXTERN void		TclDumpMemoryInfo (FILE * outFile);
+EXTERN void		TclDumpMemoryInfo(FILE *outFile);
 #endif
 /* Slot 15 is reserved */
 #ifndef TclExprFloatError_TCL_DECLARED
 #define TclExprFloatError_TCL_DECLARED
 /* 16 */
-EXTERN void		TclExprFloatError (Tcl_Interp * interp, double value);
+EXTERN void		TclExprFloatError(Tcl_Interp *interp, double value);
 #endif
 /* Slot 17 is reserved */
 /* Slot 18 is reserved */
@@ -126,107 +125,106 @@ EXTERN void		TclExprFloatError (Tcl_Interp * interp, double value);
 #ifndef TclFindElement_TCL_DECLARED
 #define TclFindElement_TCL_DECLARED
 /* 22 */
-EXTERN int		TclFindElement (Tcl_Interp * interp,
-				const char * listStr, int listLength,
-				const char ** elementPtr,
-				const char ** nextPtr, int * sizePtr,
-				int * bracePtr);
+EXTERN int		TclFindElement(Tcl_Interp *interp,
+				const char *listStr, int listLength,
+				const char **elementPtr,
+				const char **nextPtr, int *sizePtr,
+				int *bracePtr);
 #endif
 #ifndef TclFindProc_TCL_DECLARED
 #define TclFindProc_TCL_DECLARED
 /* 23 */
-EXTERN Proc *		TclFindProc (Interp * iPtr, const char * procName);
+EXTERN Proc *		TclFindProc(Interp *iPtr, const char *procName);
 #endif
 /* Slot 24 is reserved */
 #ifndef TclFreePackageInfo_TCL_DECLARED
 #define TclFreePackageInfo_TCL_DECLARED
 /* 25 */
-EXTERN void		TclFreePackageInfo (Interp * iPtr);
+EXTERN void		TclFreePackageInfo(Interp *iPtr);
 #endif
 /* Slot 26 is reserved */
 /* Slot 27 is reserved */
 #ifndef TclpGetDefaultStdChannel_TCL_DECLARED
 #define TclpGetDefaultStdChannel_TCL_DECLARED
 /* 28 */
-EXTERN Tcl_Channel	TclpGetDefaultStdChannel (int type);
+EXTERN Tcl_Channel	TclpGetDefaultStdChannel(int type);
 #endif
 /* Slot 29 is reserved */
 /* Slot 30 is reserved */
 #ifndef TclGetExtension_TCL_DECLARED
 #define TclGetExtension_TCL_DECLARED
 /* 31 */
-EXTERN const char *	TclGetExtension (const char * name);
+EXTERN const char *	TclGetExtension(const char *name);
 #endif
 #ifndef TclGetFrame_TCL_DECLARED
 #define TclGetFrame_TCL_DECLARED
 /* 32 */
-EXTERN int		TclGetFrame (Tcl_Interp * interp, const char * str,
-				CallFrame ** framePtrPtr);
+EXTERN int		TclGetFrame(Tcl_Interp *interp, const char *str,
+				CallFrame **framePtrPtr);
 #endif
 /* Slot 33 is reserved */
 #ifndef TclGetIntForIndex_TCL_DECLARED
 #define TclGetIntForIndex_TCL_DECLARED
 /* 34 */
-EXTERN int		TclGetIntForIndex (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, int endValue,
-				int * indexPtr);
+EXTERN int		TclGetIntForIndex(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int endValue, int *indexPtr);
 #endif
 /* Slot 35 is reserved */
 /* Slot 36 is reserved */
 #ifndef TclGetLoadedPackages_TCL_DECLARED
 #define TclGetLoadedPackages_TCL_DECLARED
 /* 37 */
-EXTERN int		TclGetLoadedPackages (Tcl_Interp * interp,
-				const char * targetName);
+EXTERN int		TclGetLoadedPackages(Tcl_Interp *interp,
+				const char *targetName);
 #endif
 #ifndef TclGetNamespaceForQualName_TCL_DECLARED
 #define TclGetNamespaceForQualName_TCL_DECLARED
 /* 38 */
-EXTERN int		TclGetNamespaceForQualName (Tcl_Interp * interp,
-				const char * qualName, Namespace * cxtNsPtr,
-				int flags, Namespace ** nsPtrPtr,
-				Namespace ** altNsPtrPtr,
-				Namespace ** actualCxtPtrPtr,
-				const char ** simpleNamePtr);
+EXTERN int		TclGetNamespaceForQualName(Tcl_Interp *interp,
+				const char *qualName, Namespace *cxtNsPtr,
+				int flags, Namespace **nsPtrPtr,
+				Namespace **altNsPtrPtr,
+				Namespace **actualCxtPtrPtr,
+				const char **simpleNamePtr);
 #endif
 #ifndef TclGetObjInterpProc_TCL_DECLARED
 #define TclGetObjInterpProc_TCL_DECLARED
 /* 39 */
-EXTERN TclObjCmdProcType TclGetObjInterpProc (void);
+EXTERN TclObjCmdProcType TclGetObjInterpProc(void);
 #endif
 #ifndef TclGetOpenMode_TCL_DECLARED
 #define TclGetOpenMode_TCL_DECLARED
 /* 40 */
-EXTERN int		TclGetOpenMode (Tcl_Interp * interp,
-				const char * str, int * seekFlagPtr);
+EXTERN int		TclGetOpenMode(Tcl_Interp *interp, const char *str,
+				int *seekFlagPtr);
 #endif
 #ifndef TclGetOriginalCommand_TCL_DECLARED
 #define TclGetOriginalCommand_TCL_DECLARED
 /* 41 */
-EXTERN Tcl_Command	TclGetOriginalCommand (Tcl_Command command);
+EXTERN Tcl_Command	TclGetOriginalCommand(Tcl_Command command);
 #endif
 #ifndef TclpGetUserHome_TCL_DECLARED
 #define TclpGetUserHome_TCL_DECLARED
 /* 42 */
-EXTERN CONST86 char *	TclpGetUserHome (const char * name,
-				Tcl_DString * bufferPtr);
+EXTERN CONST86 char *	TclpGetUserHome(const char *name,
+				Tcl_DString *bufferPtr);
 #endif
 /* Slot 43 is reserved */
 #ifndef TclGuessPackageName_TCL_DECLARED
 #define TclGuessPackageName_TCL_DECLARED
 /* 44 */
-EXTERN int		TclGuessPackageName (const char * fileName,
-				Tcl_DString * bufPtr);
+EXTERN int		TclGuessPackageName(const char *fileName,
+				Tcl_DString *bufPtr);
 #endif
 #ifndef TclHideUnsafeCommands_TCL_DECLARED
 #define TclHideUnsafeCommands_TCL_DECLARED
 /* 45 */
-EXTERN int		TclHideUnsafeCommands (Tcl_Interp * interp);
+EXTERN int		TclHideUnsafeCommands(Tcl_Interp *interp);
 #endif
 #ifndef TclInExit_TCL_DECLARED
 #define TclInExit_TCL_DECLARED
 /* 46 */
-EXTERN int		TclInExit (void);
+EXTERN int		TclInExit(void);
 #endif
 /* Slot 47 is reserved */
 /* Slot 48 is reserved */
@@ -234,71 +232,71 @@ EXTERN int		TclInExit (void);
 #ifndef TclInitCompiledLocals_TCL_DECLARED
 #define TclInitCompiledLocals_TCL_DECLARED
 /* 50 */
-EXTERN void		TclInitCompiledLocals (Tcl_Interp * interp,
-				CallFrame * framePtr, Namespace * nsPtr);
+EXTERN void		TclInitCompiledLocals(Tcl_Interp *interp,
+				CallFrame *framePtr, Namespace *nsPtr);
 #endif
 #ifndef TclInterpInit_TCL_DECLARED
 #define TclInterpInit_TCL_DECLARED
 /* 51 */
-EXTERN int		TclInterpInit (Tcl_Interp * interp);
+EXTERN int		TclInterpInit(Tcl_Interp *interp);
 #endif
 /* Slot 52 is reserved */
 #ifndef TclInvokeObjectCommand_TCL_DECLARED
 #define TclInvokeObjectCommand_TCL_DECLARED
 /* 53 */
-EXTERN int		TclInvokeObjectCommand (ClientData clientData,
-				Tcl_Interp * interp, int argc,
-				const char ** argv);
+EXTERN int		TclInvokeObjectCommand(ClientData clientData,
+				Tcl_Interp *interp, int argc,
+				CONST84 char **argv);
 #endif
 #ifndef TclInvokeStringCommand_TCL_DECLARED
 #define TclInvokeStringCommand_TCL_DECLARED
 /* 54 */
-EXTERN int		TclInvokeStringCommand (ClientData clientData,
-				Tcl_Interp * interp, int objc,
+EXTERN int		TclInvokeStringCommand(ClientData clientData,
+				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
 #endif
 #ifndef TclIsProc_TCL_DECLARED
 #define TclIsProc_TCL_DECLARED
 /* 55 */
-EXTERN Proc *		TclIsProc (Command * cmdPtr);
+EXTERN Proc *		TclIsProc(Command *cmdPtr);
 #endif
 /* Slot 56 is reserved */
 /* Slot 57 is reserved */
 #ifndef TclLookupVar_TCL_DECLARED
 #define TclLookupVar_TCL_DECLARED
 /* 58 */
-EXTERN Var *		TclLookupVar (Tcl_Interp * interp,
-				const char * part1, const char * part2,
-				int flags, const char * msg, int createPart1,
-				int createPart2, Var ** arrayPtrPtr);
+EXTERN Var *		TclLookupVar(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags,
+				const char *msg, int createPart1,
+				int createPart2, Var **arrayPtrPtr);
 #endif
 /* Slot 59 is reserved */
 #ifndef TclNeedSpace_TCL_DECLARED
 #define TclNeedSpace_TCL_DECLARED
 /* 60 */
-EXTERN int		TclNeedSpace (const char * start, const char * end);
+EXTERN int		TclNeedSpace(const char *start, const char *end);
 #endif
 #ifndef TclNewProcBodyObj_TCL_DECLARED
 #define TclNewProcBodyObj_TCL_DECLARED
 /* 61 */
-EXTERN Tcl_Obj *	TclNewProcBodyObj (Proc * procPtr);
+EXTERN Tcl_Obj *	TclNewProcBodyObj(Proc *procPtr);
 #endif
 #ifndef TclObjCommandComplete_TCL_DECLARED
 #define TclObjCommandComplete_TCL_DECLARED
 /* 62 */
-EXTERN int		TclObjCommandComplete (Tcl_Obj * cmdPtr);
+EXTERN int		TclObjCommandComplete(Tcl_Obj *cmdPtr);
 #endif
 #ifndef TclObjInterpProc_TCL_DECLARED
 #define TclObjInterpProc_TCL_DECLARED
 /* 63 */
-EXTERN int		TclObjInterpProc (ClientData clientData,
-				Tcl_Interp * interp, int objc,
+EXTERN int		TclObjInterpProc(ClientData clientData,
+				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
 #endif
 #ifndef TclObjInvoke_TCL_DECLARED
 #define TclObjInvoke_TCL_DECLARED
 /* 64 */
-EXTERN int		TclObjInvoke (Tcl_Interp * interp, int objc,
+EXTERN int		TclObjInvoke(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], int flags);
 #endif
 /* Slot 65 is reserved */
@@ -308,7 +306,7 @@ EXTERN int		TclObjInvoke (Tcl_Interp * interp, int objc,
 #ifndef TclpAlloc_TCL_DECLARED
 #define TclpAlloc_TCL_DECLARED
 /* 69 */
-EXTERN char *		TclpAlloc (unsigned int size);
+EXTERN char *		TclpAlloc(unsigned int size);
 #endif
 /* Slot 70 is reserved */
 /* Slot 71 is reserved */
@@ -317,34 +315,34 @@ EXTERN char *		TclpAlloc (unsigned int size);
 #ifndef TclpFree_TCL_DECLARED
 #define TclpFree_TCL_DECLARED
 /* 74 */
-EXTERN void		TclpFree (char * ptr);
+EXTERN void		TclpFree(char *ptr);
 #endif
 #ifndef TclpGetClicks_TCL_DECLARED
 #define TclpGetClicks_TCL_DECLARED
 /* 75 */
-EXTERN unsigned long	TclpGetClicks (void);
+EXTERN unsigned long	TclpGetClicks(void);
 #endif
 #ifndef TclpGetSeconds_TCL_DECLARED
 #define TclpGetSeconds_TCL_DECLARED
 /* 76 */
-EXTERN unsigned long	TclpGetSeconds (void);
+EXTERN unsigned long	TclpGetSeconds(void);
 #endif
 #ifndef TclpGetTime_TCL_DECLARED
 #define TclpGetTime_TCL_DECLARED
 /* 77 */
-EXTERN void		TclpGetTime (Tcl_Time * time);
+EXTERN void		TclpGetTime(Tcl_Time *time);
 #endif
 #ifndef TclpGetTimeZone_TCL_DECLARED
 #define TclpGetTimeZone_TCL_DECLARED
 /* 78 */
-EXTERN int		TclpGetTimeZone (unsigned long time);
+EXTERN int		TclpGetTimeZone(unsigned long time);
 #endif
 /* Slot 79 is reserved */
 /* Slot 80 is reserved */
 #ifndef TclpRealloc_TCL_DECLARED
 #define TclpRealloc_TCL_DECLARED
 /* 81 */
-EXTERN char *		TclpRealloc (char * ptr, unsigned int size);
+EXTERN char *		TclpRealloc(char *ptr, unsigned int size);
 #endif
 /* Slot 82 is reserved */
 /* Slot 83 is reserved */
@@ -355,77 +353,76 @@ EXTERN char *		TclpRealloc (char * ptr, unsigned int size);
 #ifndef TclPrecTraceProc_TCL_DECLARED
 #define TclPrecTraceProc_TCL_DECLARED
 /* 88 */
-EXTERN char *		TclPrecTraceProc (ClientData clientData,
-				Tcl_Interp * interp, const char * name1,
-				const char * name2, int flags);
+EXTERN char *		TclPrecTraceProc(ClientData clientData,
+				Tcl_Interp *interp, const char *name1,
+				const char *name2, int flags);
 #endif
 #ifndef TclPreventAliasLoop_TCL_DECLARED
 #define TclPreventAliasLoop_TCL_DECLARED
 /* 89 */
-EXTERN int		TclPreventAliasLoop (Tcl_Interp * interp,
-				Tcl_Interp * cmdInterp, Tcl_Command cmd);
+EXTERN int		TclPreventAliasLoop(Tcl_Interp *interp,
+				Tcl_Interp *cmdInterp, Tcl_Command cmd);
 #endif
 /* Slot 90 is reserved */
 #ifndef TclProcCleanupProc_TCL_DECLARED
 #define TclProcCleanupProc_TCL_DECLARED
 /* 91 */
-EXTERN void		TclProcCleanupProc (Proc * procPtr);
+EXTERN void		TclProcCleanupProc(Proc *procPtr);
 #endif
 #ifndef TclProcCompileProc_TCL_DECLARED
 #define TclProcCompileProc_TCL_DECLARED
 /* 92 */
-EXTERN int		TclProcCompileProc (Tcl_Interp * interp,
-				Proc * procPtr, Tcl_Obj * bodyPtr,
-				Namespace * nsPtr, const char * description,
-				const char * procName);
+EXTERN int		TclProcCompileProc(Tcl_Interp *interp, Proc *procPtr,
+				Tcl_Obj *bodyPtr, Namespace *nsPtr,
+				const char *description,
+				const char *procName);
 #endif
 #ifndef TclProcDeleteProc_TCL_DECLARED
 #define TclProcDeleteProc_TCL_DECLARED
 /* 93 */
-EXTERN void		TclProcDeleteProc (ClientData clientData);
+EXTERN void		TclProcDeleteProc(ClientData clientData);
 #endif
 /* Slot 94 is reserved */
 /* Slot 95 is reserved */
 #ifndef TclRenameCommand_TCL_DECLARED
 #define TclRenameCommand_TCL_DECLARED
 /* 96 */
-EXTERN int		TclRenameCommand (Tcl_Interp * interp,
-				const char * oldName, const char * newName);
+EXTERN int		TclRenameCommand(Tcl_Interp *interp,
+				const char *oldName, const char *newName);
 #endif
 #ifndef TclResetShadowedCmdRefs_TCL_DECLARED
 #define TclResetShadowedCmdRefs_TCL_DECLARED
 /* 97 */
-EXTERN void		TclResetShadowedCmdRefs (Tcl_Interp * interp,
-				Command * newCmdPtr);
+EXTERN void		TclResetShadowedCmdRefs(Tcl_Interp *interp,
+				Command *newCmdPtr);
 #endif
 #ifndef TclServiceIdle_TCL_DECLARED
 #define TclServiceIdle_TCL_DECLARED
 /* 98 */
-EXTERN int		TclServiceIdle (void);
+EXTERN int		TclServiceIdle(void);
 #endif
 /* Slot 99 is reserved */
 /* Slot 100 is reserved */
 #ifndef TclSetPreInitScript_TCL_DECLARED
 #define TclSetPreInitScript_TCL_DECLARED
 /* 101 */
-EXTERN CONST86 char *	TclSetPreInitScript (const char * string);
+EXTERN CONST86 char *	TclSetPreInitScript(const char *string);
 #endif
 #ifndef TclSetupEnv_TCL_DECLARED
 #define TclSetupEnv_TCL_DECLARED
 /* 102 */
-EXTERN void		TclSetupEnv (Tcl_Interp * interp);
+EXTERN void		TclSetupEnv(Tcl_Interp *interp);
 #endif
 #ifndef TclSockGetPort_TCL_DECLARED
 #define TclSockGetPort_TCL_DECLARED
 /* 103 */
-EXTERN int		TclSockGetPort (Tcl_Interp * interp,
-				const char * str, const char * proto,
-				int * portPtr);
+EXTERN int		TclSockGetPort(Tcl_Interp *interp, const char *str,
+				const char *proto, int *portPtr);
 #endif
 #ifndef TclSockMinimumBuffers_TCL_DECLARED
 #define TclSockMinimumBuffers_TCL_DECLARED
 /* 104 */
-EXTERN int		TclSockMinimumBuffers (int sock, int size);
+EXTERN int		TclSockMinimumBuffers(int sock, int size);
 #endif
 /* Slot 105 is reserved */
 /* Slot 106 is reserved */
@@ -433,160 +430,156 @@ EXTERN int		TclSockMinimumBuffers (int sock, int size);
 #ifndef TclTeardownNamespace_TCL_DECLARED
 #define TclTeardownNamespace_TCL_DECLARED
 /* 108 */
-EXTERN void		TclTeardownNamespace (Namespace * nsPtr);
+EXTERN void		TclTeardownNamespace(Namespace *nsPtr);
 #endif
 #ifndef TclUpdateReturnInfo_TCL_DECLARED
 #define TclUpdateReturnInfo_TCL_DECLARED
 /* 109 */
-EXTERN int		TclUpdateReturnInfo (Interp * iPtr);
+EXTERN int		TclUpdateReturnInfo(Interp *iPtr);
 #endif
 /* Slot 110 is reserved */
 #ifndef Tcl_AddInterpResolvers_TCL_DECLARED
 #define Tcl_AddInterpResolvers_TCL_DECLARED
 /* 111 */
-EXTERN void		Tcl_AddInterpResolvers (Tcl_Interp * interp,
-				const char * name,
-				Tcl_ResolveCmdProc * cmdProc,
-				Tcl_ResolveVarProc * varProc,
-				Tcl_ResolveCompiledVarProc * compiledVarProc);
+EXTERN void		Tcl_AddInterpResolvers(Tcl_Interp *interp,
+				const char *name,
+				Tcl_ResolveCmdProc *cmdProc,
+				Tcl_ResolveVarProc *varProc,
+				Tcl_ResolveCompiledVarProc *compiledVarProc);
 #endif
 #ifndef Tcl_AppendExportList_TCL_DECLARED
 #define Tcl_AppendExportList_TCL_DECLARED
 /* 112 */
-EXTERN int		Tcl_AppendExportList (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr, Tcl_Obj * objPtr);
+EXTERN int		Tcl_AppendExportList(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_CreateNamespace_TCL_DECLARED
 #define Tcl_CreateNamespace_TCL_DECLARED
 /* 113 */
-EXTERN Tcl_Namespace *	Tcl_CreateNamespace (Tcl_Interp * interp,
-				const char * name, ClientData clientData,
-				Tcl_NamespaceDeleteProc * deleteProc);
+EXTERN Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
+				const char *name, ClientData clientData,
+				Tcl_NamespaceDeleteProc *deleteProc);
 #endif
 #ifndef Tcl_DeleteNamespace_TCL_DECLARED
 #define Tcl_DeleteNamespace_TCL_DECLARED
 /* 114 */
-EXTERN void		Tcl_DeleteNamespace (Tcl_Namespace * nsPtr);
+EXTERN void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
 #endif
 #ifndef Tcl_Export_TCL_DECLARED
 #define Tcl_Export_TCL_DECLARED
 /* 115 */
-EXTERN int		Tcl_Export (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr, const char * pattern,
-				int resetListFirst);
+EXTERN int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int resetListFirst);
 #endif
 #ifndef Tcl_FindCommand_TCL_DECLARED
 #define Tcl_FindCommand_TCL_DECLARED
 /* 116 */
-EXTERN Tcl_Command	Tcl_FindCommand (Tcl_Interp * interp,
-				const char * name,
-				Tcl_Namespace * contextNsPtr, int flags);
+EXTERN Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
 #endif
 #ifndef Tcl_FindNamespace_TCL_DECLARED
 #define Tcl_FindNamespace_TCL_DECLARED
 /* 117 */
-EXTERN Tcl_Namespace *	Tcl_FindNamespace (Tcl_Interp * interp,
-				const char * name,
-				Tcl_Namespace * contextNsPtr, int flags);
+EXTERN Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
 #endif
 #ifndef Tcl_GetInterpResolvers_TCL_DECLARED
 #define Tcl_GetInterpResolvers_TCL_DECLARED
 /* 118 */
-EXTERN int		Tcl_GetInterpResolvers (Tcl_Interp * interp,
-				const char * name,
-				Tcl_ResolverInfo * resInfo);
+EXTERN int		Tcl_GetInterpResolvers(Tcl_Interp *interp,
+				const char *name, Tcl_ResolverInfo *resInfo);
 #endif
 #ifndef Tcl_GetNamespaceResolvers_TCL_DECLARED
 #define Tcl_GetNamespaceResolvers_TCL_DECLARED
 /* 119 */
-EXTERN int		Tcl_GetNamespaceResolvers (
-				Tcl_Namespace * namespacePtr,
-				Tcl_ResolverInfo * resInfo);
+EXTERN int		Tcl_GetNamespaceResolvers(
+				Tcl_Namespace *namespacePtr,
+				Tcl_ResolverInfo *resInfo);
 #endif
 #ifndef Tcl_FindNamespaceVar_TCL_DECLARED
 #define Tcl_FindNamespaceVar_TCL_DECLARED
 /* 120 */
-EXTERN Tcl_Var		Tcl_FindNamespaceVar (Tcl_Interp * interp,
-				const char * name,
-				Tcl_Namespace * contextNsPtr, int flags);
+EXTERN Tcl_Var		Tcl_FindNamespaceVar(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
 #endif
 #ifndef Tcl_ForgetImport_TCL_DECLARED
 #define Tcl_ForgetImport_TCL_DECLARED
 /* 121 */
-EXTERN int		Tcl_ForgetImport (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr, const char * pattern);
+EXTERN int		Tcl_ForgetImport(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, const char *pattern);
 #endif
 #ifndef Tcl_GetCommandFromObj_TCL_DECLARED
 #define Tcl_GetCommandFromObj_TCL_DECLARED
 /* 122 */
-EXTERN Tcl_Command	Tcl_GetCommandFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr);
+EXTERN Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetCommandFullName_TCL_DECLARED
 #define Tcl_GetCommandFullName_TCL_DECLARED
 /* 123 */
-EXTERN void		Tcl_GetCommandFullName (Tcl_Interp * interp,
-				Tcl_Command command, Tcl_Obj * objPtr);
+EXTERN void		Tcl_GetCommandFullName(Tcl_Interp *interp,
+				Tcl_Command command, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetCurrentNamespace_TCL_DECLARED
 #define Tcl_GetCurrentNamespace_TCL_DECLARED
 /* 124 */
-EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace (Tcl_Interp * interp);
+EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_GetGlobalNamespace_TCL_DECLARED
 #define Tcl_GetGlobalNamespace_TCL_DECLARED
 /* 125 */
-EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace (Tcl_Interp * interp);
+EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_GetVariableFullName_TCL_DECLARED
 #define Tcl_GetVariableFullName_TCL_DECLARED
 /* 126 */
-EXTERN void		Tcl_GetVariableFullName (Tcl_Interp * interp,
-				Tcl_Var variable, Tcl_Obj * objPtr);
+EXTERN void		Tcl_GetVariableFullName(Tcl_Interp *interp,
+				Tcl_Var variable, Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_Import_TCL_DECLARED
 #define Tcl_Import_TCL_DECLARED
 /* 127 */
-EXTERN int		Tcl_Import (Tcl_Interp * interp,
-				Tcl_Namespace * nsPtr, const char * pattern,
-				int allowOverwrite);
+EXTERN int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int allowOverwrite);
 #endif
 #ifndef Tcl_PopCallFrame_TCL_DECLARED
 #define Tcl_PopCallFrame_TCL_DECLARED
 /* 128 */
-EXTERN void		Tcl_PopCallFrame (Tcl_Interp * interp);
+EXTERN void		Tcl_PopCallFrame(Tcl_Interp *interp);
 #endif
 #ifndef Tcl_PushCallFrame_TCL_DECLARED
 #define Tcl_PushCallFrame_TCL_DECLARED
 /* 129 */
-EXTERN int		Tcl_PushCallFrame (Tcl_Interp * interp,
-				Tcl_CallFrame * framePtr,
-				Tcl_Namespace * nsPtr, int isProcCallFrame);
+EXTERN int		Tcl_PushCallFrame(Tcl_Interp *interp,
+				Tcl_CallFrame *framePtr,
+				Tcl_Namespace *nsPtr, int isProcCallFrame);
 #endif
 #ifndef Tcl_RemoveInterpResolvers_TCL_DECLARED
 #define Tcl_RemoveInterpResolvers_TCL_DECLARED
 /* 130 */
-EXTERN int		Tcl_RemoveInterpResolvers (Tcl_Interp * interp,
-				const char * name);
+EXTERN int		Tcl_RemoveInterpResolvers(Tcl_Interp *interp,
+				const char *name);
 #endif
 #ifndef Tcl_SetNamespaceResolvers_TCL_DECLARED
 #define Tcl_SetNamespaceResolvers_TCL_DECLARED
 /* 131 */
-EXTERN void		Tcl_SetNamespaceResolvers (
-				Tcl_Namespace * namespacePtr,
-				Tcl_ResolveCmdProc * cmdProc,
-				Tcl_ResolveVarProc * varProc,
-				Tcl_ResolveCompiledVarProc * compiledVarProc);
+EXTERN void		Tcl_SetNamespaceResolvers(
+				Tcl_Namespace *namespacePtr,
+				Tcl_ResolveCmdProc *cmdProc,
+				Tcl_ResolveVarProc *varProc,
+				Tcl_ResolveCompiledVarProc *compiledVarProc);
 #endif
 #ifndef TclpHasSockets_TCL_DECLARED
 #define TclpHasSockets_TCL_DECLARED
 /* 132 */
-EXTERN int		TclpHasSockets (Tcl_Interp * interp);
+EXTERN int		TclpHasSockets(Tcl_Interp *interp);
 #endif
 #ifndef TclpGetDate_TCL_DECLARED
 #define TclpGetDate_TCL_DECLARED
 /* 133 */
-EXTERN struct tm *	TclpGetDate (const time_t * time, int useGMT);
+EXTERN struct tm *	TclpGetDate(const time_t *time, int useGMT);
 #endif
 /* Slot 134 is reserved */
 /* Slot 135 is reserved */
@@ -595,94 +588,95 @@ EXTERN struct tm *	TclpGetDate (const time_t * time, int useGMT);
 #ifndef TclGetEnv_TCL_DECLARED
 #define TclGetEnv_TCL_DECLARED
 /* 138 */
-EXTERN const char *	TclGetEnv (const char * name, Tcl_DString * valuePtr);
+EXTERN CONST84_RETURN char * TclGetEnv(const char *name,
+				Tcl_DString *valuePtr);
 #endif
 /* Slot 139 is reserved */
 /* Slot 140 is reserved */
 #ifndef TclpGetCwd_TCL_DECLARED
 #define TclpGetCwd_TCL_DECLARED
 /* 141 */
-EXTERN const char *	TclpGetCwd (Tcl_Interp * interp,
-				Tcl_DString * cwdPtr);
+EXTERN CONST84_RETURN char * TclpGetCwd(Tcl_Interp *interp,
+				Tcl_DString *cwdPtr);
 #endif
 #ifndef TclSetByteCodeFromAny_TCL_DECLARED
 #define TclSetByteCodeFromAny_TCL_DECLARED
 /* 142 */
-EXTERN int		TclSetByteCodeFromAny (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, CompileHookProc * hookProc,
+EXTERN int		TclSetByteCodeFromAny(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, CompileHookProc *hookProc,
 				ClientData clientData);
 #endif
 #ifndef TclAddLiteralObj_TCL_DECLARED
 #define TclAddLiteralObj_TCL_DECLARED
 /* 143 */
-EXTERN int		TclAddLiteralObj (struct CompileEnv * envPtr,
-				Tcl_Obj * objPtr, LiteralEntry ** litPtrPtr);
+EXTERN int		TclAddLiteralObj(struct CompileEnv *envPtr,
+				Tcl_Obj *objPtr, LiteralEntry **litPtrPtr);
 #endif
 #ifndef TclHideLiteral_TCL_DECLARED
 #define TclHideLiteral_TCL_DECLARED
 /* 144 */
-EXTERN void		TclHideLiteral (Tcl_Interp * interp,
-				struct CompileEnv * envPtr, int index);
+EXTERN void		TclHideLiteral(Tcl_Interp *interp,
+				struct CompileEnv *envPtr, int index);
 #endif
 #ifndef TclGetAuxDataType_TCL_DECLARED
 #define TclGetAuxDataType_TCL_DECLARED
 /* 145 */
-EXTERN const struct AuxDataType * TclGetAuxDataType (const char * typeName);
+EXTERN const struct AuxDataType * TclGetAuxDataType(const char *typeName);
 #endif
 #ifndef TclHandleCreate_TCL_DECLARED
 #define TclHandleCreate_TCL_DECLARED
 /* 146 */
-EXTERN TclHandle	TclHandleCreate (void * ptr);
+EXTERN TclHandle	TclHandleCreate(void *ptr);
 #endif
 #ifndef TclHandleFree_TCL_DECLARED
 #define TclHandleFree_TCL_DECLARED
 /* 147 */
-EXTERN void		TclHandleFree (TclHandle handle);
+EXTERN void		TclHandleFree(TclHandle handle);
 #endif
 #ifndef TclHandlePreserve_TCL_DECLARED
 #define TclHandlePreserve_TCL_DECLARED
 /* 148 */
-EXTERN TclHandle	TclHandlePreserve (TclHandle handle);
+EXTERN TclHandle	TclHandlePreserve(TclHandle handle);
 #endif
 #ifndef TclHandleRelease_TCL_DECLARED
 #define TclHandleRelease_TCL_DECLARED
 /* 149 */
-EXTERN void		TclHandleRelease (TclHandle handle);
+EXTERN void		TclHandleRelease(TclHandle handle);
 #endif
 #ifndef TclRegAbout_TCL_DECLARED
 #define TclRegAbout_TCL_DECLARED
 /* 150 */
-EXTERN int		TclRegAbout (Tcl_Interp * interp, Tcl_RegExp re);
+EXTERN int		TclRegAbout(Tcl_Interp *interp, Tcl_RegExp re);
 #endif
 #ifndef TclRegExpRangeUniChar_TCL_DECLARED
 #define TclRegExpRangeUniChar_TCL_DECLARED
 /* 151 */
-EXTERN void		TclRegExpRangeUniChar (Tcl_RegExp re, int index,
-				int * startPtr, int * endPtr);
+EXTERN void		TclRegExpRangeUniChar(Tcl_RegExp re, int index,
+				int *startPtr, int *endPtr);
 #endif
 #ifndef TclSetLibraryPath_TCL_DECLARED
 #define TclSetLibraryPath_TCL_DECLARED
 /* 152 */
-EXTERN void		TclSetLibraryPath (Tcl_Obj * pathPtr);
+EXTERN void		TclSetLibraryPath(Tcl_Obj *pathPtr);
 #endif
 #ifndef TclGetLibraryPath_TCL_DECLARED
 #define TclGetLibraryPath_TCL_DECLARED
 /* 153 */
-EXTERN Tcl_Obj *	TclGetLibraryPath (void);
+EXTERN Tcl_Obj *	TclGetLibraryPath(void);
 #endif
 /* Slot 154 is reserved */
 /* Slot 155 is reserved */
 #ifndef TclRegError_TCL_DECLARED
 #define TclRegError_TCL_DECLARED
 /* 156 */
-EXTERN void		TclRegError (Tcl_Interp * interp, const char * msg,
+EXTERN void		TclRegError(Tcl_Interp *interp, const char *msg,
 				int status);
 #endif
 #ifndef TclVarTraceExists_TCL_DECLARED
 #define TclVarTraceExists_TCL_DECLARED
 /* 157 */
-EXTERN Var *		TclVarTraceExists (Tcl_Interp * interp,
-				const char * varName);
+EXTERN Var *		TclVarTraceExists(Tcl_Interp *interp,
+				const char *varName);
 #endif
 /* Slot 158 is reserved */
 /* Slot 159 is reserved */
@@ -690,93 +684,93 @@ EXTERN Var *		TclVarTraceExists (Tcl_Interp * interp,
 #ifndef TclChannelTransform_TCL_DECLARED
 #define TclChannelTransform_TCL_DECLARED
 /* 161 */
-EXTERN int		TclChannelTransform (Tcl_Interp * interp,
-				Tcl_Channel chan, Tcl_Obj * cmdObjPtr);
+EXTERN int		TclChannelTransform(Tcl_Interp *interp,
+				Tcl_Channel chan, Tcl_Obj *cmdObjPtr);
 #endif
 #ifndef TclChannelEventScriptInvoker_TCL_DECLARED
 #define TclChannelEventScriptInvoker_TCL_DECLARED
 /* 162 */
-EXTERN void		TclChannelEventScriptInvoker (ClientData clientData,
+EXTERN void		TclChannelEventScriptInvoker(ClientData clientData,
 				int flags);
 #endif
 #ifndef TclGetInstructionTable_TCL_DECLARED
 #define TclGetInstructionTable_TCL_DECLARED
 /* 163 */
-EXTERN const void *	TclGetInstructionTable (void);
+EXTERN const void *	TclGetInstructionTable(void);
 #endif
 #ifndef TclExpandCodeArray_TCL_DECLARED
 #define TclExpandCodeArray_TCL_DECLARED
 /* 164 */
-EXTERN void		TclExpandCodeArray (void * envPtr);
+EXTERN void		TclExpandCodeArray(void *envPtr);
 #endif
 #ifndef TclpSetInitialEncodings_TCL_DECLARED
 #define TclpSetInitialEncodings_TCL_DECLARED
 /* 165 */
-EXTERN void		TclpSetInitialEncodings (void);
+EXTERN void		TclpSetInitialEncodings(void);
 #endif
 #ifndef TclListObjSetElement_TCL_DECLARED
 #define TclListObjSetElement_TCL_DECLARED
 /* 166 */
-EXTERN int		TclListObjSetElement (Tcl_Interp * interp,
-				Tcl_Obj * listPtr, int index,
-				Tcl_Obj * valuePtr);
+EXTERN int		TclListObjSetElement(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int index,
+				Tcl_Obj *valuePtr);
 #endif
 /* Slot 167 is reserved */
 /* Slot 168 is reserved */
 #ifndef TclpUtfNcmp2_TCL_DECLARED
 #define TclpUtfNcmp2_TCL_DECLARED
 /* 169 */
-EXTERN int		TclpUtfNcmp2 (const char * s1, const char * s2,
+EXTERN int		TclpUtfNcmp2(const char *s1, const char *s2,
 				unsigned long n);
 #endif
 #ifndef TclCheckInterpTraces_TCL_DECLARED
 #define TclCheckInterpTraces_TCL_DECLARED
 /* 170 */
-EXTERN int		TclCheckInterpTraces (Tcl_Interp * interp,
-				const char * command, int numChars,
-				Command * cmdPtr, int result, int traceFlags,
+EXTERN int		TclCheckInterpTraces(Tcl_Interp *interp,
+				const char *command, int numChars,
+				Command *cmdPtr, int result, int traceFlags,
 				int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef TclCheckExecutionTraces_TCL_DECLARED
 #define TclCheckExecutionTraces_TCL_DECLARED
 /* 171 */
-EXTERN int		TclCheckExecutionTraces (Tcl_Interp * interp,
-				const char * command, int numChars,
-				Command * cmdPtr, int result, int traceFlags,
+EXTERN int		TclCheckExecutionTraces(Tcl_Interp *interp,
+				const char *command, int numChars,
+				Command *cmdPtr, int result, int traceFlags,
 				int objc, Tcl_Obj *const objv[]);
 #endif
 #ifndef TclInThreadExit_TCL_DECLARED
 #define TclInThreadExit_TCL_DECLARED
 /* 172 */
-EXTERN int		TclInThreadExit (void);
+EXTERN int		TclInThreadExit(void);
 #endif
 #ifndef TclUniCharMatch_TCL_DECLARED
 #define TclUniCharMatch_TCL_DECLARED
 /* 173 */
-EXTERN int		TclUniCharMatch (const Tcl_UniChar * string,
-				int strLen, const Tcl_UniChar * pattern,
+EXTERN int		TclUniCharMatch(const Tcl_UniChar *string,
+				int strLen, const Tcl_UniChar *pattern,
 				int ptnLen, int flags);
 #endif
 /* Slot 174 is reserved */
 #ifndef TclCallVarTraces_TCL_DECLARED
 #define TclCallVarTraces_TCL_DECLARED
 /* 175 */
-EXTERN int		TclCallVarTraces (Interp * iPtr, Var * arrayPtr,
-				Var * varPtr, const char * part1,
-				const char * part2, int flags,
+EXTERN int		TclCallVarTraces(Interp *iPtr, Var *arrayPtr,
+				Var *varPtr, const char *part1,
+				const char *part2, int flags,
 				int leaveErrMsg);
 #endif
 #ifndef TclCleanupVar_TCL_DECLARED
 #define TclCleanupVar_TCL_DECLARED
 /* 176 */
-EXTERN void		TclCleanupVar (Var * varPtr, Var * arrayPtr);
+EXTERN void		TclCleanupVar(Var *varPtr, Var *arrayPtr);
 #endif
 #ifndef TclVarErrMsg_TCL_DECLARED
 #define TclVarErrMsg_TCL_DECLARED
 /* 177 */
-EXTERN void		TclVarErrMsg (Tcl_Interp * interp,
-				const char * part1, const char * part2,
-				const char * operation, const char * reason);
+EXTERN void		TclVarErrMsg(Tcl_Interp *interp, const char *part1,
+				const char *part2, const char *operation,
+				const char *reason);
 #endif
 /* Slot 178 is reserved */
 /* Slot 179 is reserved */
@@ -785,12 +779,12 @@ EXTERN void		TclVarErrMsg (Tcl_Interp * interp,
 #ifndef TclpLocaltime_TCL_DECLARED
 #define TclpLocaltime_TCL_DECLARED
 /* 182 */
-EXTERN struct tm *	TclpLocaltime (const time_t * clock);
+EXTERN struct tm *	TclpLocaltime(const time_t *clock);
 #endif
 #ifndef TclpGmtime_TCL_DECLARED
 #define TclpGmtime_TCL_DECLARED
 /* 183 */
-EXTERN struct tm *	TclpGmtime (const time_t * clock);
+EXTERN struct tm *	TclpGmtime(const time_t *clock);
 #endif
 /* Slot 184 is reserved */
 /* Slot 185 is reserved */
@@ -809,59 +803,59 @@ EXTERN struct tm *	TclpGmtime (const time_t * clock);
 #ifndef TclObjGetFrame_TCL_DECLARED
 #define TclObjGetFrame_TCL_DECLARED
 /* 198 */
-EXTERN int		TclObjGetFrame (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, CallFrame ** framePtrPtr);
+EXTERN int		TclObjGetFrame(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				CallFrame **framePtrPtr);
 #endif
 /* Slot 199 is reserved */
 #ifndef TclpObjRemoveDirectory_TCL_DECLARED
 #define TclpObjRemoveDirectory_TCL_DECLARED
 /* 200 */
-EXTERN int		TclpObjRemoveDirectory (Tcl_Obj * pathPtr,
-				int recursive, Tcl_Obj ** errorPtr);
+EXTERN int		TclpObjRemoveDirectory(Tcl_Obj *pathPtr,
+				int recursive, Tcl_Obj **errorPtr);
 #endif
 #ifndef TclpObjCopyDirectory_TCL_DECLARED
 #define TclpObjCopyDirectory_TCL_DECLARED
 /* 201 */
-EXTERN int		TclpObjCopyDirectory (Tcl_Obj * srcPathPtr,
-				Tcl_Obj * destPathPtr, Tcl_Obj ** errorPtr);
+EXTERN int		TclpObjCopyDirectory(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
 #endif
 #ifndef TclpObjCreateDirectory_TCL_DECLARED
 #define TclpObjCreateDirectory_TCL_DECLARED
 /* 202 */
-EXTERN int		TclpObjCreateDirectory (Tcl_Obj * pathPtr);
+EXTERN int		TclpObjCreateDirectory(Tcl_Obj *pathPtr);
 #endif
 #ifndef TclpObjDeleteFile_TCL_DECLARED
 #define TclpObjDeleteFile_TCL_DECLARED
 /* 203 */
-EXTERN int		TclpObjDeleteFile (Tcl_Obj * pathPtr);
+EXTERN int		TclpObjDeleteFile(Tcl_Obj *pathPtr);
 #endif
 #ifndef TclpObjCopyFile_TCL_DECLARED
 #define TclpObjCopyFile_TCL_DECLARED
 /* 204 */
-EXTERN int		TclpObjCopyFile (Tcl_Obj * srcPathPtr,
-				Tcl_Obj * destPathPtr);
+EXTERN int		TclpObjCopyFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
 #endif
 #ifndef TclpObjRenameFile_TCL_DECLARED
 #define TclpObjRenameFile_TCL_DECLARED
 /* 205 */
-EXTERN int		TclpObjRenameFile (Tcl_Obj * srcPathPtr,
-				Tcl_Obj * destPathPtr);
+EXTERN int		TclpObjRenameFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
 #endif
 #ifndef TclpObjStat_TCL_DECLARED
 #define TclpObjStat_TCL_DECLARED
 /* 206 */
-EXTERN int		TclpObjStat (Tcl_Obj * pathPtr, Tcl_StatBuf * buf);
+EXTERN int		TclpObjStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
 #endif
 #ifndef TclpObjAccess_TCL_DECLARED
 #define TclpObjAccess_TCL_DECLARED
 /* 207 */
-EXTERN int		TclpObjAccess (Tcl_Obj * pathPtr, int mode);
+EXTERN int		TclpObjAccess(Tcl_Obj *pathPtr, int mode);
 #endif
 #ifndef TclpOpenFileChannel_TCL_DECLARED
 #define TclpOpenFileChannel_TCL_DECLARED
 /* 208 */
-EXTERN Tcl_Channel	TclpOpenFileChannel (Tcl_Interp * interp,
-				Tcl_Obj * pathPtr, int mode, int permissions);
+EXTERN Tcl_Channel	TclpOpenFileChannel(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr, int mode, int permissions);
 #endif
 /* Slot 209 is reserved */
 /* Slot 210 is reserved */
@@ -869,41 +863,41 @@ EXTERN Tcl_Channel	TclpOpenFileChannel (Tcl_Interp * interp,
 #ifndef TclpFindExecutable_TCL_DECLARED
 #define TclpFindExecutable_TCL_DECLARED
 /* 212 */
-EXTERN void		TclpFindExecutable (const char * argv0);
+EXTERN void		TclpFindExecutable(const char *argv0);
 #endif
 #ifndef TclGetObjNameOfExecutable_TCL_DECLARED
 #define TclGetObjNameOfExecutable_TCL_DECLARED
 /* 213 */
-EXTERN Tcl_Obj *	TclGetObjNameOfExecutable (void);
+EXTERN Tcl_Obj *	TclGetObjNameOfExecutable(void);
 #endif
 #ifndef TclSetObjNameOfExecutable_TCL_DECLARED
 #define TclSetObjNameOfExecutable_TCL_DECLARED
 /* 214 */
-EXTERN void		TclSetObjNameOfExecutable (Tcl_Obj * name,
+EXTERN void		TclSetObjNameOfExecutable(Tcl_Obj *name,
 				Tcl_Encoding encoding);
 #endif
 #ifndef TclStackAlloc_TCL_DECLARED
 #define TclStackAlloc_TCL_DECLARED
 /* 215 */
-EXTERN void *		TclStackAlloc (Tcl_Interp * interp, int numBytes);
+EXTERN void *		TclStackAlloc(Tcl_Interp *interp, int numBytes);
 #endif
 #ifndef TclStackFree_TCL_DECLARED
 #define TclStackFree_TCL_DECLARED
 /* 216 */
-EXTERN void		TclStackFree (Tcl_Interp * interp, void * freePtr);
+EXTERN void		TclStackFree(Tcl_Interp *interp, void *freePtr);
 #endif
 #ifndef TclPushStackFrame_TCL_DECLARED
 #define TclPushStackFrame_TCL_DECLARED
 /* 217 */
-EXTERN int		TclPushStackFrame (Tcl_Interp * interp,
-				Tcl_CallFrame ** framePtrPtr,
-				Tcl_Namespace * namespacePtr,
+EXTERN int		TclPushStackFrame(Tcl_Interp *interp,
+				Tcl_CallFrame **framePtrPtr,
+				Tcl_Namespace *namespacePtr,
 				int isProcCallFrame);
 #endif
 #ifndef TclPopStackFrame_TCL_DECLARED
 #define TclPopStackFrame_TCL_DECLARED
 /* 218 */
-EXTERN void		TclPopStackFrame (Tcl_Interp * interp);
+EXTERN void		TclPopStackFrame(Tcl_Interp *interp);
 #endif
 /* Slot 219 is reserved */
 /* Slot 220 is reserved */
@@ -913,144 +907,140 @@ EXTERN void		TclPopStackFrame (Tcl_Interp * interp);
 #ifndef TclGetPlatform_TCL_DECLARED
 #define TclGetPlatform_TCL_DECLARED
 /* 224 */
-EXTERN TclPlatformType * TclGetPlatform (void);
+EXTERN TclPlatformType * TclGetPlatform(void);
 #endif
 #ifndef TclTraceDictPath_TCL_DECLARED
 #define TclTraceDictPath_TCL_DECLARED
 /* 225 */
-EXTERN Tcl_Obj *	TclTraceDictPath (Tcl_Interp * interp,
-				Tcl_Obj * rootPtr, int keyc,
+EXTERN Tcl_Obj *	TclTraceDictPath(Tcl_Interp *interp,
+				Tcl_Obj *rootPtr, int keyc,
 				Tcl_Obj *const keyv[], int flags);
 #endif
 #ifndef TclObjBeingDeleted_TCL_DECLARED
 #define TclObjBeingDeleted_TCL_DECLARED
 /* 226 */
-EXTERN int		TclObjBeingDeleted (Tcl_Obj * objPtr);
+EXTERN int		TclObjBeingDeleted(Tcl_Obj *objPtr);
 #endif
 #ifndef TclSetNsPath_TCL_DECLARED
 #define TclSetNsPath_TCL_DECLARED
 /* 227 */
-EXTERN void		TclSetNsPath (Namespace * nsPtr, int pathLength,
-				Tcl_Namespace * pathAry[]);
+EXTERN void		TclSetNsPath(Namespace *nsPtr, int pathLength,
+				Tcl_Namespace *pathAry[]);
 #endif
 /* Slot 228 is reserved */
 #ifndef TclPtrMakeUpvar_TCL_DECLARED
 #define TclPtrMakeUpvar_TCL_DECLARED
 /* 229 */
-EXTERN int		TclPtrMakeUpvar (Tcl_Interp * interp,
-				Var * otherP1Ptr, const char * myName,
-				int myFlags, int index);
+EXTERN int		TclPtrMakeUpvar(Tcl_Interp *interp, Var *otherP1Ptr,
+				const char *myName, int myFlags, int index);
 #endif
 #ifndef TclObjLookupVar_TCL_DECLARED
 #define TclObjLookupVar_TCL_DECLARED
 /* 230 */
-EXTERN Var *		TclObjLookupVar (Tcl_Interp * interp,
-				Tcl_Obj * part1Ptr, const char * part2,
-				int flags, const char * msg,
+EXTERN Var *		TclObjLookupVar(Tcl_Interp *interp,
+				Tcl_Obj *part1Ptr, const char *part2,
+				int flags, const char *msg,
 				const int createPart1, const int createPart2,
-				Var ** arrayPtrPtr);
+				Var **arrayPtrPtr);
 #endif
 #ifndef TclGetNamespaceFromObj_TCL_DECLARED
 #define TclGetNamespaceFromObj_TCL_DECLARED
 /* 231 */
-EXTERN int		TclGetNamespaceFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, Tcl_Namespace ** nsPtrPtr);
+EXTERN int		TclGetNamespaceFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Namespace **nsPtrPtr);
 #endif
 #ifndef TclEvalObjEx_TCL_DECLARED
 #define TclEvalObjEx_TCL_DECLARED
 /* 232 */
-EXTERN int		TclEvalObjEx (Tcl_Interp * interp, Tcl_Obj * objPtr,
-				int flags, const CmdFrame * invoker,
-				int word);
+EXTERN int		TclEvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags, const CmdFrame *invoker, int word);
 #endif
 #ifndef TclGetSrcInfoForPc_TCL_DECLARED
 #define TclGetSrcInfoForPc_TCL_DECLARED
 /* 233 */
-EXTERN void		TclGetSrcInfoForPc (CmdFrame * contextPtr);
+EXTERN void		TclGetSrcInfoForPc(CmdFrame *contextPtr);
 #endif
 #ifndef TclVarHashCreateVar_TCL_DECLARED
 #define TclVarHashCreateVar_TCL_DECLARED
 /* 234 */
-EXTERN Var *		TclVarHashCreateVar (TclVarHashTable * tablePtr,
-				const char * key, int * newPtr);
+EXTERN Var *		TclVarHashCreateVar(TclVarHashTable *tablePtr,
+				const char *key, int *newPtr);
 #endif
 #ifndef TclInitVarHashTable_TCL_DECLARED
 #define TclInitVarHashTable_TCL_DECLARED
 /* 235 */
-EXTERN void		TclInitVarHashTable (TclVarHashTable * tablePtr,
-				Namespace * nsPtr);
+EXTERN void		TclInitVarHashTable(TclVarHashTable *tablePtr,
+				Namespace *nsPtr);
 #endif
 #ifndef Tcl_BackgroundException_TCL_DECLARED
 #define Tcl_BackgroundException_TCL_DECLARED
 /* 236 */
-EXTERN void		Tcl_BackgroundException (Tcl_Interp * interp,
-				int code);
+EXTERN void		Tcl_BackgroundException(Tcl_Interp *interp, int code);
 #endif
 #ifndef TclResetCancellation_TCL_DECLARED
 #define TclResetCancellation_TCL_DECLARED
 /* 237 */
-EXTERN int		TclResetCancellation (Tcl_Interp * interp, int force);
+EXTERN int		TclResetCancellation(Tcl_Interp *interp, int force);
 #endif
 #ifndef TclNRInterpProc_TCL_DECLARED
 #define TclNRInterpProc_TCL_DECLARED
 /* 238 */
-EXTERN int		TclNRInterpProc (ClientData clientData,
-				Tcl_Interp * interp, int objc,
+EXTERN int		TclNRInterpProc(ClientData clientData,
+				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
 #endif
 #ifndef TclNRInterpProcCore_TCL_DECLARED
 #define TclNRInterpProcCore_TCL_DECLARED
 /* 239 */
-EXTERN int		TclNRInterpProcCore (Tcl_Interp * interp,
-				Tcl_Obj * procNameObj, int skip,
+EXTERN int		TclNRInterpProcCore(Tcl_Interp *interp,
+				Tcl_Obj *procNameObj, int skip,
 				ProcErrorProc errorProc);
 #endif
 #ifndef TclNRRunCallbacks_TCL_DECLARED
 #define TclNRRunCallbacks_TCL_DECLARED
 /* 240 */
-EXTERN int		TclNRRunCallbacks (Tcl_Interp * interp, int result,
-				struct TEOV_callback * rootPtr, int tebcCall);
+EXTERN int		TclNRRunCallbacks(Tcl_Interp *interp, int result,
+				struct TEOV_callback *rootPtr, int tebcCall);
 #endif
 #ifndef TclNREvalObjEx_TCL_DECLARED
 #define TclNREvalObjEx_TCL_DECLARED
 /* 241 */
-EXTERN int		TclNREvalObjEx (Tcl_Interp * interp,
-				Tcl_Obj * objPtr, int flags,
-				const CmdFrame * invoker, int word);
+EXTERN int		TclNREvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags, const CmdFrame *invoker, int word);
 #endif
 #ifndef TclNREvalObjv_TCL_DECLARED
 #define TclNREvalObjv_TCL_DECLARED
 /* 242 */
-EXTERN int		TclNREvalObjv (Tcl_Interp * interp, int objc,
+EXTERN int		TclNREvalObjv(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], int flags,
-				Command * cmdPtr);
+				Command *cmdPtr);
 #endif
 #ifndef TclDbDumpActiveObjects_TCL_DECLARED
 #define TclDbDumpActiveObjects_TCL_DECLARED
 /* 243 */
-EXTERN void		TclDbDumpActiveObjects (FILE * outFile);
+EXTERN void		TclDbDumpActiveObjects(FILE *outFile);
 #endif
 #ifndef TclGetNamespaceChildTable_TCL_DECLARED
 #define TclGetNamespaceChildTable_TCL_DECLARED
 /* 244 */
-EXTERN Tcl_HashTable *	TclGetNamespaceChildTable (Tcl_Namespace * nsPtr);
+EXTERN Tcl_HashTable *	TclGetNamespaceChildTable(Tcl_Namespace *nsPtr);
 #endif
 #ifndef TclGetNamespaceCommandTable_TCL_DECLARED
 #define TclGetNamespaceCommandTable_TCL_DECLARED
 /* 245 */
-EXTERN Tcl_HashTable *	TclGetNamespaceCommandTable (Tcl_Namespace * nsPtr);
+EXTERN Tcl_HashTable *	TclGetNamespaceCommandTable(Tcl_Namespace *nsPtr);
 #endif
 #ifndef TclInitRewriteEnsemble_TCL_DECLARED
 #define TclInitRewriteEnsemble_TCL_DECLARED
 /* 246 */
-EXTERN int		TclInitRewriteEnsemble (Tcl_Interp * interp,
+EXTERN int		TclInitRewriteEnsemble(Tcl_Interp *interp,
 				int numRemoved, int numInserted,
-				Tcl_Obj *const * objv);
+				Tcl_Obj *const *objv);
 #endif
 #ifndef TclResetRewriteEnsemble_TCL_DECLARED
 #define TclResetRewriteEnsemble_TCL_DECLARED
 /* 247 */
-EXTERN void		TclResetRewriteEnsemble (Tcl_Interp * interp,
+EXTERN void		TclResetRewriteEnsemble(Tcl_Interp *interp,
 				int isRootEnsemble);
 #endif
 
@@ -1111,7 +1101,7 @@ typedef struct TclIntStubs {
     void (*tclInitCompiledLocals) (Tcl_Interp * interp, CallFrame * framePtr, Namespace * nsPtr); /* 50 */
     int (*tclInterpInit) (Tcl_Interp * interp); /* 51 */
     void *reserved52;
-    int (*tclInvokeObjectCommand) (ClientData clientData, Tcl_Interp * interp, int argc, const char ** argv); /* 53 */
+    int (*tclInvokeObjectCommand) (ClientData clientData, Tcl_Interp * interp, int argc, CONST84 char ** argv); /* 53 */
     int (*tclInvokeStringCommand) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *const objv[]); /* 54 */
     Proc * (*tclIsProc) (Command * cmdPtr); /* 55 */
     void *reserved56;
@@ -1196,10 +1186,10 @@ typedef struct TclIntStubs {
     void *reserved135;
     void *reserved136;
     void *reserved137;
-    const char * (*tclGetEnv) (const char * name, Tcl_DString * valuePtr); /* 138 */
+    CONST84_RETURN char * (*tclGetEnv) (const char * name, Tcl_DString * valuePtr); /* 138 */
     void *reserved139;
     void *reserved140;
-    const char * (*tclpGetCwd) (Tcl_Interp * interp, Tcl_DString * cwdPtr); /* 141 */
+    CONST84_RETURN char * (*tclpGetCwd) (Tcl_Interp * interp, Tcl_DString * cwdPtr); /* 141 */
     int (*tclSetByteCodeFromAny) (Tcl_Interp * interp, Tcl_Obj * objPtr, CompileHookProc * hookProc, ClientData clientData); /* 142 */
     int (*tclAddLiteralObj) (struct CompileEnv * envPtr, Tcl_Obj * objPtr, LiteralEntry ** litPtrPtr); /* 143 */
     void (*tclHideLiteral) (Tcl_Interp * interp, struct CompileEnv * envPtr, int index); /* 144 */
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 620a73d..3521088 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.40 2010/01/22 13:02:50 nijtmans Exp $
+ * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.41 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #ifndef _TCLINTPLATDECLS
@@ -42,81 +42,80 @@
 #ifndef TclGetAndDetachPids_TCL_DECLARED
 #define TclGetAndDetachPids_TCL_DECLARED
 /* 0 */
-EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp,
+EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
 #endif
 #ifndef TclpCloseFile_TCL_DECLARED
 #define TclpCloseFile_TCL_DECLARED
 /* 1 */
-EXTERN int		TclpCloseFile (TclFile file);
+EXTERN int		TclpCloseFile(TclFile file);
 #endif
 #ifndef TclpCreateCommandChannel_TCL_DECLARED
 #define TclpCreateCommandChannel_TCL_DECLARED
 /* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile,
+EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
 				TclFile writeFile, TclFile errorFile,
-				int numPids, Tcl_Pid * pidPtr);
+				int numPids, Tcl_Pid *pidPtr);
 #endif
 #ifndef TclpCreatePipe_TCL_DECLARED
 #define TclpCreatePipe_TCL_DECLARED
 /* 3 */
-EXTERN int		TclpCreatePipe (TclFile * readPipe,
-				TclFile * writePipe);
+EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
 #endif
 #ifndef TclpCreateProcess_TCL_DECLARED
 #define TclpCreateProcess_TCL_DECLARED
 /* 4 */
-EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc,
-				const char ** argv, TclFile inputFile,
+EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+				const char **argv, TclFile inputFile,
 				TclFile outputFile, TclFile errorFile,
-				Tcl_Pid * pidPtr);
+				Tcl_Pid *pidPtr);
 #endif
 /* Slot 5 is reserved */
 #ifndef TclpMakeFile_TCL_DECLARED
 #define TclpMakeFile_TCL_DECLARED
 /* 6 */
-EXTERN TclFile		TclpMakeFile (Tcl_Channel channel, int direction);
+EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
 #endif
 #ifndef TclpOpenFile_TCL_DECLARED
 #define TclpOpenFile_TCL_DECLARED
 /* 7 */
-EXTERN TclFile		TclpOpenFile (const char * fname, int mode);
+EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
 #endif
 #ifndef TclUnixWaitForFile_TCL_DECLARED
 #define TclUnixWaitForFile_TCL_DECLARED
 /* 8 */
-EXTERN int		TclUnixWaitForFile (int fd, int mask, int timeout);
+EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
 #endif
 #ifndef TclpCreateTempFile_TCL_DECLARED
 #define TclpCreateTempFile_TCL_DECLARED
 /* 9 */
-EXTERN TclFile		TclpCreateTempFile (const char * contents);
+EXTERN TclFile		TclpCreateTempFile(const char *contents);
 #endif
 #ifndef TclpReaddir_TCL_DECLARED
 #define TclpReaddir_TCL_DECLARED
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir (DIR * dir);
+EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
 #endif
 #ifndef TclpLocaltime_unix_TCL_DECLARED
 #define TclpLocaltime_unix_TCL_DECLARED
 /* 11 */
-EXTERN struct tm *	TclpLocaltime_unix (const time_t * clock);
+EXTERN struct tm *	TclpLocaltime_unix(const time_t *clock);
 #endif
 #ifndef TclpGmtime_unix_TCL_DECLARED
 #define TclpGmtime_unix_TCL_DECLARED
 /* 12 */
-EXTERN struct tm *	TclpGmtime_unix (const time_t * clock);
+EXTERN struct tm *	TclpGmtime_unix(const time_t *clock);
 #endif
 #ifndef TclpInetNtoa_TCL_DECLARED
 #define TclpInetNtoa_TCL_DECLARED
 /* 13 */
-EXTERN char *		TclpInetNtoa (struct in_addr addr);
+EXTERN char *		TclpInetNtoa(struct in_addr addr);
 #endif
 #ifndef TclUnixCopyFile_TCL_DECLARED
 #define TclUnixCopyFile_TCL_DECLARED
 /* 14 */
-EXTERN int		TclUnixCopyFile (const char * src, const char * dst,
-				const Tcl_StatBuf * statBufPtr,
+EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+				const Tcl_StatBuf *statBufPtr,
 				int dontCopyAtts);
 #endif
 #endif /* UNIX */
@@ -124,255 +123,253 @@ EXTERN int		TclUnixCopyFile (const char * src, const char * dst,
 #ifndef TclWinConvertError_TCL_DECLARED
 #define TclWinConvertError_TCL_DECLARED
 /* 0 */
-EXTERN void		TclWinConvertError (unsigned long errCode);
+EXTERN void		TclWinConvertError(unsigned long errCode);
 #endif
 #ifndef TclWinConvertWSAError_TCL_DECLARED
 #define TclWinConvertWSAError_TCL_DECLARED
 /* 1 */
-EXTERN void		TclWinConvertWSAError (unsigned long errCode);
+EXTERN void		TclWinConvertWSAError(unsigned long errCode);
 #endif
 #ifndef TclWinGetServByName_TCL_DECLARED
 #define TclWinGetServByName_TCL_DECLARED
 /* 2 */
-EXTERN struct servent *	 TclWinGetServByName (const char * nm,
-				const char * proto);
+EXTERN struct servent *	 TclWinGetServByName(const char *nm,
+				const char *proto);
 #endif
 #ifndef TclWinGetSockOpt_TCL_DECLARED
 #define TclWinGetSockOpt_TCL_DECLARED
 /* 3 */
-EXTERN int		TclWinGetSockOpt (int s, int level, int optname,
-				char FAR * optval, int FAR * optlen);
+EXTERN int		TclWinGetSockOpt(int s, int level, int optname,
+				char FAR *optval, int FAR *optlen);
 #endif
 #ifndef TclWinGetTclInstance_TCL_DECLARED
 #define TclWinGetTclInstance_TCL_DECLARED
 /* 4 */
-EXTERN HINSTANCE	TclWinGetTclInstance (void);
+EXTERN HINSTANCE	TclWinGetTclInstance(void);
 #endif
 /* Slot 5 is reserved */
 #ifndef TclWinNToHS_TCL_DECLARED
 #define TclWinNToHS_TCL_DECLARED
 /* 6 */
-EXTERN u_short		TclWinNToHS (u_short ns);
+EXTERN u_short		TclWinNToHS(u_short ns);
 #endif
 #ifndef TclWinSetSockOpt_TCL_DECLARED
 #define TclWinSetSockOpt_TCL_DECLARED
 /* 7 */
-EXTERN int		TclWinSetSockOpt (int s, int level, int optname,
-				const char FAR * optval, int optlen);
+EXTERN int		TclWinSetSockOpt(int s, int level, int optname,
+				const char FAR *optval, int optlen);
 #endif
 #ifndef TclpGetPid_TCL_DECLARED
 #define TclpGetPid_TCL_DECLARED
 /* 8 */
-EXTERN unsigned long	TclpGetPid (Tcl_Pid pid);
+EXTERN unsigned long	TclpGetPid(Tcl_Pid pid);
 #endif
 #ifndef TclWinGetPlatformId_TCL_DECLARED
 #define TclWinGetPlatformId_TCL_DECLARED
 /* 9 */
-EXTERN int		TclWinGetPlatformId (void);
+EXTERN int		TclWinGetPlatformId(void);
 #endif
 /* Slot 10 is reserved */
 #ifndef TclGetAndDetachPids_TCL_DECLARED
 #define TclGetAndDetachPids_TCL_DECLARED
 /* 11 */
-EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp,
+EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
 #endif
 #ifndef TclpCloseFile_TCL_DECLARED
 #define TclpCloseFile_TCL_DECLARED
 /* 12 */
-EXTERN int		TclpCloseFile (TclFile file);
+EXTERN int		TclpCloseFile(TclFile file);
 #endif
 #ifndef TclpCreateCommandChannel_TCL_DECLARED
 #define TclpCreateCommandChannel_TCL_DECLARED
 /* 13 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile,
+EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
 				TclFile writeFile, TclFile errorFile,
-				int numPids, Tcl_Pid * pidPtr);
+				int numPids, Tcl_Pid *pidPtr);
 #endif
 #ifndef TclpCreatePipe_TCL_DECLARED
 #define TclpCreatePipe_TCL_DECLARED
 /* 14 */
-EXTERN int		TclpCreatePipe (TclFile * readPipe,
-				TclFile * writePipe);
+EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
 #endif
 #ifndef TclpCreateProcess_TCL_DECLARED
 #define TclpCreateProcess_TCL_DECLARED
 /* 15 */
-EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc,
-				const char ** argv, TclFile inputFile,
+EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+				const char **argv, TclFile inputFile,
 				TclFile outputFile, TclFile errorFile,
-				Tcl_Pid * pidPtr);
+				Tcl_Pid *pidPtr);
 #endif
 /* Slot 16 is reserved */
 /* Slot 17 is reserved */
 #ifndef TclpMakeFile_TCL_DECLARED
 #define TclpMakeFile_TCL_DECLARED
 /* 18 */
-EXTERN TclFile		TclpMakeFile (Tcl_Channel channel, int direction);
+EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
 #endif
 #ifndef TclpOpenFile_TCL_DECLARED
 #define TclpOpenFile_TCL_DECLARED
 /* 19 */
-EXTERN TclFile		TclpOpenFile (const char * fname, int mode);
+EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
 #endif
 #ifndef TclWinAddProcess_TCL_DECLARED
 #define TclWinAddProcess_TCL_DECLARED
 /* 20 */
-EXTERN void		TclWinAddProcess (void * hProcess, unsigned long id);
+EXTERN void		TclWinAddProcess(void *hProcess, unsigned long id);
 #endif
 /* Slot 21 is reserved */
 #ifndef TclpCreateTempFile_TCL_DECLARED
 #define TclpCreateTempFile_TCL_DECLARED
 /* 22 */
-EXTERN TclFile		TclpCreateTempFile (const char * contents);
+EXTERN TclFile		TclpCreateTempFile(const char *contents);
 #endif
 #ifndef TclpGetTZName_TCL_DECLARED
 #define TclpGetTZName_TCL_DECLARED
 /* 23 */
-EXTERN char *		TclpGetTZName (int isdst);
+EXTERN char *		TclpGetTZName(int isdst);
 #endif
 #ifndef TclWinNoBackslash_TCL_DECLARED
 #define TclWinNoBackslash_TCL_DECLARED
 /* 24 */
-EXTERN char *		TclWinNoBackslash (char * path);
+EXTERN char *		TclWinNoBackslash(char *path);
 #endif
 /* Slot 25 is reserved */
 #ifndef TclWinSetInterfaces_TCL_DECLARED
 #define TclWinSetInterfaces_TCL_DECLARED
 /* 26 */
-EXTERN void		TclWinSetInterfaces (int wide);
+EXTERN void		TclWinSetInterfaces(int wide);
 #endif
 #ifndef TclWinFlushDirtyChannels_TCL_DECLARED
 #define TclWinFlushDirtyChannels_TCL_DECLARED
 /* 27 */
-EXTERN void		TclWinFlushDirtyChannels (void);
+EXTERN void		TclWinFlushDirtyChannels(void);
 #endif
 #ifndef TclWinResetInterfaces_TCL_DECLARED
 #define TclWinResetInterfaces_TCL_DECLARED
 /* 28 */
-EXTERN void		TclWinResetInterfaces (void);
+EXTERN void		TclWinResetInterfaces(void);
 #endif
 #ifndef TclWinCPUID_TCL_DECLARED
 #define TclWinCPUID_TCL_DECLARED
 /* 29 */
-EXTERN int		TclWinCPUID (unsigned int index, unsigned int * regs);
+EXTERN int		TclWinCPUID(unsigned int index, unsigned int *regs);
 #endif
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
 #ifndef TclGetAndDetachPids_TCL_DECLARED
 #define TclGetAndDetachPids_TCL_DECLARED
 /* 0 */
-EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp,
+EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
 #endif
 #ifndef TclpCloseFile_TCL_DECLARED
 #define TclpCloseFile_TCL_DECLARED
 /* 1 */
-EXTERN int		TclpCloseFile (TclFile file);
+EXTERN int		TclpCloseFile(TclFile file);
 #endif
 #ifndef TclpCreateCommandChannel_TCL_DECLARED
 #define TclpCreateCommandChannel_TCL_DECLARED
 /* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile,
+EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
 				TclFile writeFile, TclFile errorFile,
-				int numPids, Tcl_Pid * pidPtr);
+				int numPids, Tcl_Pid *pidPtr);
 #endif
 #ifndef TclpCreatePipe_TCL_DECLARED
 #define TclpCreatePipe_TCL_DECLARED
 /* 3 */
-EXTERN int		TclpCreatePipe (TclFile * readPipe,
-				TclFile * writePipe);
+EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
 #endif
 #ifndef TclpCreateProcess_TCL_DECLARED
 #define TclpCreateProcess_TCL_DECLARED
 /* 4 */
-EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc,
-				const char ** argv, TclFile inputFile,
+EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+				const char **argv, TclFile inputFile,
 				TclFile outputFile, TclFile errorFile,
-				Tcl_Pid * pidPtr);
+				Tcl_Pid *pidPtr);
 #endif
 /* Slot 5 is reserved */
 #ifndef TclpMakeFile_TCL_DECLARED
 #define TclpMakeFile_TCL_DECLARED
 /* 6 */
-EXTERN TclFile		TclpMakeFile (Tcl_Channel channel, int direction);
+EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
 #endif
 #ifndef TclpOpenFile_TCL_DECLARED
 #define TclpOpenFile_TCL_DECLARED
 /* 7 */
-EXTERN TclFile		TclpOpenFile (const char * fname, int mode);
+EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
 #endif
 #ifndef TclUnixWaitForFile_TCL_DECLARED
 #define TclUnixWaitForFile_TCL_DECLARED
 /* 8 */
-EXTERN int		TclUnixWaitForFile (int fd, int mask, int timeout);
+EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
 #endif
 #ifndef TclpCreateTempFile_TCL_DECLARED
 #define TclpCreateTempFile_TCL_DECLARED
 /* 9 */
-EXTERN TclFile		TclpCreateTempFile (const char * contents);
+EXTERN TclFile		TclpCreateTempFile(const char *contents);
 #endif
 #ifndef TclpReaddir_TCL_DECLARED
 #define TclpReaddir_TCL_DECLARED
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir (DIR * dir);
+EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
 #endif
 #ifndef TclpLocaltime_unix_TCL_DECLARED
 #define TclpLocaltime_unix_TCL_DECLARED
 /* 11 */
-EXTERN struct tm *	TclpLocaltime_unix (const time_t * clock);
+EXTERN struct tm *	TclpLocaltime_unix(const time_t *clock);
 #endif
 #ifndef TclpGmtime_unix_TCL_DECLARED
 #define TclpGmtime_unix_TCL_DECLARED
 /* 12 */
-EXTERN struct tm *	TclpGmtime_unix (const time_t * clock);
+EXTERN struct tm *	TclpGmtime_unix(const time_t *clock);
 #endif
 #ifndef TclpInetNtoa_TCL_DECLARED
 #define TclpInetNtoa_TCL_DECLARED
 /* 13 */
-EXTERN char *		TclpInetNtoa (struct in_addr addr);
+EXTERN char *		TclpInetNtoa(struct in_addr addr);
 #endif
 #ifndef TclUnixCopyFile_TCL_DECLARED
 #define TclUnixCopyFile_TCL_DECLARED
 /* 14 */
-EXTERN int		TclUnixCopyFile (const char * src, const char * dst,
-				const Tcl_StatBuf * statBufPtr,
+EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+				const Tcl_StatBuf *statBufPtr,
 				int dontCopyAtts);
 #endif
 #ifndef TclMacOSXGetFileAttribute_TCL_DECLARED
 #define TclMacOSXGetFileAttribute_TCL_DECLARED
 /* 15 */
-EXTERN int		TclMacOSXGetFileAttribute (Tcl_Interp * interp,
-				int objIndex, Tcl_Obj * fileName,
-				Tcl_Obj ** attributePtrPtr);
+EXTERN int		TclMacOSXGetFileAttribute(Tcl_Interp *interp,
+				int objIndex, Tcl_Obj *fileName,
+				Tcl_Obj **attributePtrPtr);
 #endif
 #ifndef TclMacOSXSetFileAttribute_TCL_DECLARED
 #define TclMacOSXSetFileAttribute_TCL_DECLARED
 /* 16 */
-EXTERN int		TclMacOSXSetFileAttribute (Tcl_Interp * interp,
-				int objIndex, Tcl_Obj * fileName,
-				Tcl_Obj * attributePtr);
+EXTERN int		TclMacOSXSetFileAttribute(Tcl_Interp *interp,
+				int objIndex, Tcl_Obj *fileName,
+				Tcl_Obj *attributePtr);
 #endif
 #ifndef TclMacOSXCopyFileAttributes_TCL_DECLARED
 #define TclMacOSXCopyFileAttributes_TCL_DECLARED
 /* 17 */
-EXTERN int		TclMacOSXCopyFileAttributes (const char * src,
-				const char * dst,
-				const Tcl_StatBuf * statBufPtr);
+EXTERN int		TclMacOSXCopyFileAttributes(const char *src,
+				const char *dst,
+				const Tcl_StatBuf *statBufPtr);
 #endif
 #ifndef TclMacOSXMatchType_TCL_DECLARED
 #define TclMacOSXMatchType_TCL_DECLARED
 /* 18 */
-EXTERN int		TclMacOSXMatchType (Tcl_Interp * interp,
-				const char * pathName, const char * fileName,
-				Tcl_StatBuf * statBufPtr,
-				Tcl_GlobTypeData * types);
+EXTERN int		TclMacOSXMatchType(Tcl_Interp *interp,
+				const char *pathName, const char *fileName,
+				Tcl_StatBuf *statBufPtr,
+				Tcl_GlobTypeData *types);
 #endif
 #ifndef TclMacOSXNotifierAddRunLoopMode_TCL_DECLARED
 #define TclMacOSXNotifierAddRunLoopMode_TCL_DECLARED
 /* 19 */
-EXTERN void		TclMacOSXNotifierAddRunLoopMode (
-				const void * runLoopMode);
+EXTERN void		TclMacOSXNotifierAddRunLoopMode(
+				const void *runLoopMode);
 #endif
 #endif /* MACOSX */
 
diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h
index c42c02f..46e4889 100644
--- a/generic/tclOODecls.h
+++ b/generic/tclOODecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOODecls.h,v 1.12 2009/07/19 11:46:53 dkf Exp $
+ * $Id: tclOODecls.h,v 1.13 2010/01/29 16:17:20 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  */
@@ -41,176 +41,176 @@ extern const char *TclOOInitializeStubs(Tcl_Interp *, const char *version);
 #ifndef Tcl_CopyObjectInstance_TCL_DECLARED
 #define Tcl_CopyObjectInstance_TCL_DECLARED
 /* 0 */
-EXTERN Tcl_Object	Tcl_CopyObjectInstance (Tcl_Interp * interp,
+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
 /* 1 */
-EXTERN Tcl_Object	Tcl_GetClassAsObject (Tcl_Class clazz);
+EXTERN Tcl_Object	Tcl_GetClassAsObject(Tcl_Class clazz);
 #endif
 #ifndef Tcl_GetObjectAsClass_TCL_DECLARED
 #define Tcl_GetObjectAsClass_TCL_DECLARED
 /* 2 */
-EXTERN Tcl_Class	Tcl_GetObjectAsClass (Tcl_Object object);
+EXTERN Tcl_Class	Tcl_GetObjectAsClass(Tcl_Object object);
 #endif
 #ifndef Tcl_GetObjectCommand_TCL_DECLARED
 #define Tcl_GetObjectCommand_TCL_DECLARED
 /* 3 */
-EXTERN Tcl_Command	Tcl_GetObjectCommand (Tcl_Object object);
+EXTERN Tcl_Command	Tcl_GetObjectCommand(Tcl_Object object);
 #endif
 #ifndef Tcl_GetObjectFromObj_TCL_DECLARED
 #define Tcl_GetObjectFromObj_TCL_DECLARED
 /* 4 */
-EXTERN Tcl_Object	Tcl_GetObjectFromObj (Tcl_Interp * interp,
-				Tcl_Obj * objPtr);
+EXTERN Tcl_Object	Tcl_GetObjectFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
 #endif
 #ifndef Tcl_GetObjectNamespace_TCL_DECLARED
 #define Tcl_GetObjectNamespace_TCL_DECLARED
 /* 5 */
-EXTERN Tcl_Namespace *	Tcl_GetObjectNamespace (Tcl_Object object);
+EXTERN Tcl_Namespace *	Tcl_GetObjectNamespace(Tcl_Object object);
 #endif
 #ifndef Tcl_MethodDeclarerClass_TCL_DECLARED
 #define Tcl_MethodDeclarerClass_TCL_DECLARED
 /* 6 */
-EXTERN Tcl_Class	Tcl_MethodDeclarerClass (Tcl_Method method);
+EXTERN Tcl_Class	Tcl_MethodDeclarerClass(Tcl_Method method);
 #endif
 #ifndef Tcl_MethodDeclarerObject_TCL_DECLARED
 #define Tcl_MethodDeclarerObject_TCL_DECLARED
 /* 7 */
-EXTERN Tcl_Object	Tcl_MethodDeclarerObject (Tcl_Method method);
+EXTERN Tcl_Object	Tcl_MethodDeclarerObject(Tcl_Method method);
 #endif
 #ifndef Tcl_MethodIsPublic_TCL_DECLARED
 #define Tcl_MethodIsPublic_TCL_DECLARED
 /* 8 */
-EXTERN int		Tcl_MethodIsPublic (Tcl_Method method);
+EXTERN int		Tcl_MethodIsPublic(Tcl_Method method);
 #endif
 #ifndef Tcl_MethodIsType_TCL_DECLARED
 #define Tcl_MethodIsType_TCL_DECLARED
 /* 9 */
-EXTERN int		Tcl_MethodIsType (Tcl_Method method,
-				const Tcl_MethodType * typePtr,
-				ClientData * clientDataPtr);
+EXTERN int		Tcl_MethodIsType(Tcl_Method method,
+				const Tcl_MethodType *typePtr,
+				ClientData *clientDataPtr);
 #endif
 #ifndef Tcl_MethodName_TCL_DECLARED
 #define Tcl_MethodName_TCL_DECLARED
 /* 10 */
-EXTERN Tcl_Obj *	Tcl_MethodName (Tcl_Method method);
+EXTERN Tcl_Obj *	Tcl_MethodName(Tcl_Method method);
 #endif
 #ifndef Tcl_NewInstanceMethod_TCL_DECLARED
 #define Tcl_NewInstanceMethod_TCL_DECLARED
 /* 11 */
-EXTERN Tcl_Method	Tcl_NewInstanceMethod (Tcl_Interp * interp,
-				Tcl_Object object, Tcl_Obj * nameObj,
-				int isPublic, const Tcl_MethodType * typePtr,
+EXTERN Tcl_Method	Tcl_NewInstanceMethod(Tcl_Interp *interp,
+				Tcl_Object object, Tcl_Obj *nameObj,
+				int isPublic, const Tcl_MethodType *typePtr,
 				ClientData clientData);
 #endif
 #ifndef Tcl_NewMethod_TCL_DECLARED
 #define Tcl_NewMethod_TCL_DECLARED
 /* 12 */
-EXTERN Tcl_Method	Tcl_NewMethod (Tcl_Interp * interp, Tcl_Class cls,
-				Tcl_Obj * nameObj, int isPublic,
-				const Tcl_MethodType * typePtr,
+EXTERN Tcl_Method	Tcl_NewMethod(Tcl_Interp *interp, Tcl_Class cls,
+				Tcl_Obj *nameObj, int isPublic,
+				const Tcl_MethodType *typePtr,
 				ClientData clientData);
 #endif
 #ifndef Tcl_NewObjectInstance_TCL_DECLARED
 #define Tcl_NewObjectInstance_TCL_DECLARED
 /* 13 */
-EXTERN Tcl_Object	Tcl_NewObjectInstance (Tcl_Interp * interp,
-				Tcl_Class cls, const char * nameStr,
-				const char * nsNameStr, int objc,
-				Tcl_Obj *const * objv, int skip);
+EXTERN Tcl_Object	Tcl_NewObjectInstance(Tcl_Interp *interp,
+				Tcl_Class cls, const char *nameStr,
+				const char *nsNameStr, int objc,
+				Tcl_Obj *const *objv, int skip);
 #endif
 #ifndef Tcl_ObjectDeleted_TCL_DECLARED
 #define Tcl_ObjectDeleted_TCL_DECLARED
 /* 14 */
-EXTERN int		Tcl_ObjectDeleted (Tcl_Object object);
+EXTERN int		Tcl_ObjectDeleted(Tcl_Object object);
 #endif
 #ifndef Tcl_ObjectContextIsFiltering_TCL_DECLARED
 #define Tcl_ObjectContextIsFiltering_TCL_DECLARED
 /* 15 */
-EXTERN int		Tcl_ObjectContextIsFiltering (
+EXTERN int		Tcl_ObjectContextIsFiltering(
 				Tcl_ObjectContext context);
 #endif
 #ifndef Tcl_ObjectContextMethod_TCL_DECLARED
 #define Tcl_ObjectContextMethod_TCL_DECLARED
 /* 16 */
-EXTERN Tcl_Method	Tcl_ObjectContextMethod (Tcl_ObjectContext context);
+EXTERN Tcl_Method	Tcl_ObjectContextMethod(Tcl_ObjectContext context);
 #endif
 #ifndef Tcl_ObjectContextObject_TCL_DECLARED
 #define Tcl_ObjectContextObject_TCL_DECLARED
 /* 17 */
-EXTERN Tcl_Object	Tcl_ObjectContextObject (Tcl_ObjectContext context);
+EXTERN Tcl_Object	Tcl_ObjectContextObject(Tcl_ObjectContext context);
 #endif
 #ifndef Tcl_ObjectContextSkippedArgs_TCL_DECLARED
 #define Tcl_ObjectContextSkippedArgs_TCL_DECLARED
 /* 18 */
-EXTERN int		Tcl_ObjectContextSkippedArgs (
+EXTERN int		Tcl_ObjectContextSkippedArgs(
 				Tcl_ObjectContext context);
 #endif
 #ifndef Tcl_ClassGetMetadata_TCL_DECLARED
 #define Tcl_ClassGetMetadata_TCL_DECLARED
 /* 19 */
-EXTERN ClientData	Tcl_ClassGetMetadata (Tcl_Class clazz,
-				const Tcl_ObjectMetadataType * typePtr);
+EXTERN ClientData	Tcl_ClassGetMetadata(Tcl_Class clazz,
+				const Tcl_ObjectMetadataType *typePtr);
 #endif
 #ifndef Tcl_ClassSetMetadata_TCL_DECLARED
 #define Tcl_ClassSetMetadata_TCL_DECLARED
 /* 20 */
-EXTERN void		Tcl_ClassSetMetadata (Tcl_Class clazz,
-				const Tcl_ObjectMetadataType * typePtr,
+EXTERN void		Tcl_ClassSetMetadata(Tcl_Class clazz,
+				const Tcl_ObjectMetadataType *typePtr,
 				ClientData metadata);
 #endif
 #ifndef Tcl_ObjectGetMetadata_TCL_DECLARED
 #define Tcl_ObjectGetMetadata_TCL_DECLARED
 /* 21 */
-EXTERN ClientData	Tcl_ObjectGetMetadata (Tcl_Object object,
-				const Tcl_ObjectMetadataType * typePtr);
+EXTERN ClientData	Tcl_ObjectGetMetadata(Tcl_Object object,
+				const Tcl_ObjectMetadataType *typePtr);
 #endif
 #ifndef Tcl_ObjectSetMetadata_TCL_DECLARED
 #define Tcl_ObjectSetMetadata_TCL_DECLARED
 /* 22 */
-EXTERN void		Tcl_ObjectSetMetadata (Tcl_Object object,
-				const Tcl_ObjectMetadataType * typePtr,
+EXTERN void		Tcl_ObjectSetMetadata(Tcl_Object object,
+				const Tcl_ObjectMetadataType *typePtr,
 				ClientData metadata);
 #endif
 #ifndef Tcl_ObjectContextInvokeNext_TCL_DECLARED
 #define Tcl_ObjectContextInvokeNext_TCL_DECLARED
 /* 23 */
-EXTERN int		Tcl_ObjectContextInvokeNext (Tcl_Interp * interp,
+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
 /* 24 */
-EXTERN Tcl_ObjectMapMethodNameProc Tcl_ObjectGetMethodNameMapper (
+EXTERN Tcl_ObjectMapMethodNameProc Tcl_ObjectGetMethodNameMapper(
 				Tcl_Object object);
 #endif
 #ifndef Tcl_ObjectSetMethodNameMapper_TCL_DECLARED
 #define Tcl_ObjectSetMethodNameMapper_TCL_DECLARED
 /* 25 */
-EXTERN void		Tcl_ObjectSetMethodNameMapper (Tcl_Object object,
+EXTERN void		Tcl_ObjectSetMethodNameMapper(Tcl_Object object,
 				Tcl_ObjectMapMethodNameProc mapMethodNameProc);
 #endif
 #ifndef Tcl_ClassSetConstructor_TCL_DECLARED
 #define Tcl_ClassSetConstructor_TCL_DECLARED
 /* 26 */
-EXTERN void		Tcl_ClassSetConstructor (Tcl_Interp * interp,
+EXTERN void		Tcl_ClassSetConstructor(Tcl_Interp *interp,
 				Tcl_Class clazz, Tcl_Method method);
 #endif
 #ifndef Tcl_ClassSetDestructor_TCL_DECLARED
 #define Tcl_ClassSetDestructor_TCL_DECLARED
 /* 27 */
-EXTERN void		Tcl_ClassSetDestructor (Tcl_Interp * interp,
+EXTERN void		Tcl_ClassSetDestructor(Tcl_Interp *interp,
 				Tcl_Class clazz, Tcl_Method method);
 #endif
 #ifndef Tcl_GetObjectName_TCL_DECLARED
 #define Tcl_GetObjectName_TCL_DECLARED
 /* 28 */
-EXTERN Tcl_Obj *	Tcl_GetObjectName (Tcl_Interp * interp,
+EXTERN Tcl_Obj *	Tcl_GetObjectName(Tcl_Interp *interp,
 				Tcl_Object object);
 #endif
 
diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index aea18e2..dc52638 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclOOInt.h,v 1.14 2010/01/28 10:25:05 dkf Exp $
+ * RCS: @(#) $Id: tclOOInt.h,v 1.15 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #ifndef TCL_OO_INTERNAL_H
@@ -96,7 +96,7 @@ typedef struct ProcedureMethod {
     TclOO_PostCallProc postCallProc;
 				/* Callback to allow for additional cleanup
 				 * after the method executes. */
-    GetFrameInfoValueProc gfivProc;
+    GetFrameInfoValueProc *gfivProc;
 				/* Callback to allow for fine tuning of how
 				 * the method reports itself. */
 } ProcedureMethod;
diff --git a/generic/tclOOIntDecls.h b/generic/tclOOIntDecls.h
index 807c333..13bd387 100644
--- a/generic/tclOOIntDecls.h
+++ b/generic/tclOOIntDecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOOIntDecls.h,v 1.10 2008/10/22 20:23:59 nijtmans Exp $
+ * $Id: tclOOIntDecls.h,v 1.11 2010/01/29 16:17:20 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  */
@@ -33,128 +33,126 @@
 #ifndef TclOOGetDefineCmdContext_TCL_DECLARED
 #define TclOOGetDefineCmdContext_TCL_DECLARED
 /* 0 */
-EXTERN Tcl_Object	TclOOGetDefineCmdContext (Tcl_Interp * interp);
+EXTERN Tcl_Object	TclOOGetDefineCmdContext(Tcl_Interp *interp);
 #endif
 #ifndef TclOOMakeProcInstanceMethod_TCL_DECLARED
 #define TclOOMakeProcInstanceMethod_TCL_DECLARED
 /* 1 */
-EXTERN Tcl_Method	TclOOMakeProcInstanceMethod (Tcl_Interp * interp,
-				Object * oPtr, int flags, Tcl_Obj * nameObj,
-				Tcl_Obj * argsObj, Tcl_Obj * bodyObj,
-				const Tcl_MethodType * typePtr,
-				ClientData clientData, Proc ** procPtrPtr);
+EXTERN Tcl_Method	TclOOMakeProcInstanceMethod(Tcl_Interp *interp,
+				Object *oPtr, int flags, Tcl_Obj *nameObj,
+				Tcl_Obj *argsObj, Tcl_Obj *bodyObj,
+				const Tcl_MethodType *typePtr,
+				ClientData clientData, Proc **procPtrPtr);
 #endif
 #ifndef TclOOMakeProcMethod_TCL_DECLARED
 #define TclOOMakeProcMethod_TCL_DECLARED
 /* 2 */
-EXTERN Tcl_Method	TclOOMakeProcMethod (Tcl_Interp * interp,
-				Class * clsPtr, int flags, Tcl_Obj * nameObj,
-				const char * namePtr, Tcl_Obj * argsObj,
-				Tcl_Obj * bodyObj,
-				const Tcl_MethodType * typePtr,
-				ClientData clientData, Proc ** procPtrPtr);
+EXTERN Tcl_Method	TclOOMakeProcMethod(Tcl_Interp *interp,
+				Class *clsPtr, int flags, Tcl_Obj *nameObj,
+				const char *namePtr, Tcl_Obj *argsObj,
+				Tcl_Obj *bodyObj,
+				const Tcl_MethodType *typePtr,
+				ClientData clientData, Proc **procPtrPtr);
 #endif
 #ifndef TclOONewProcInstanceMethod_TCL_DECLARED
 #define TclOONewProcInstanceMethod_TCL_DECLARED
 /* 3 */
-EXTERN Method *		TclOONewProcInstanceMethod (Tcl_Interp * interp,
-				Object * oPtr, int flags, Tcl_Obj * nameObj,
-				Tcl_Obj * argsObj, Tcl_Obj * bodyObj,
-				ProcedureMethod ** pmPtrPtr);
+EXTERN Method *		TclOONewProcInstanceMethod(Tcl_Interp *interp,
+				Object *oPtr, int flags, Tcl_Obj *nameObj,
+				Tcl_Obj *argsObj, Tcl_Obj *bodyObj,
+				ProcedureMethod **pmPtrPtr);
 #endif
 #ifndef TclOONewProcMethod_TCL_DECLARED
 #define TclOONewProcMethod_TCL_DECLARED
 /* 4 */
-EXTERN Method *		TclOONewProcMethod (Tcl_Interp * interp,
-				Class * clsPtr, int flags, Tcl_Obj * nameObj,
-				Tcl_Obj * argsObj, Tcl_Obj * bodyObj,
-				ProcedureMethod ** pmPtrPtr);
+EXTERN Method *		TclOONewProcMethod(Tcl_Interp *interp, Class *clsPtr,
+				int flags, Tcl_Obj *nameObj,
+				Tcl_Obj *argsObj, Tcl_Obj *bodyObj,
+				ProcedureMethod **pmPtrPtr);
 #endif
 #ifndef TclOOObjectCmdCore_TCL_DECLARED
 #define TclOOObjectCmdCore_TCL_DECLARED
 /* 5 */
-EXTERN int		TclOOObjectCmdCore (Object * oPtr,
-				Tcl_Interp * interp, int objc,
-				Tcl_Obj *const * objv, int publicOnly,
-				Class * startCls);
+EXTERN int		TclOOObjectCmdCore(Object *oPtr, Tcl_Interp *interp,
+				int objc, Tcl_Obj *const *objv,
+				int publicOnly, Class *startCls);
 #endif
 #ifndef TclOOIsReachable_TCL_DECLARED
 #define TclOOIsReachable_TCL_DECLARED
 /* 6 */
-EXTERN int		TclOOIsReachable (Class * targetPtr,
-				Class * startPtr);
+EXTERN int		TclOOIsReachable(Class *targetPtr, Class *startPtr);
 #endif
 #ifndef TclOONewForwardMethod_TCL_DECLARED
 #define TclOONewForwardMethod_TCL_DECLARED
 /* 7 */
-EXTERN Method *		TclOONewForwardMethod (Tcl_Interp * interp,
-				Class * clsPtr, int isPublic,
-				Tcl_Obj * nameObj, Tcl_Obj * prefixObj);
+EXTERN Method *		TclOONewForwardMethod(Tcl_Interp *interp,
+				Class *clsPtr, int isPublic,
+				Tcl_Obj *nameObj, Tcl_Obj *prefixObj);
 #endif
 #ifndef TclOONewForwardInstanceMethod_TCL_DECLARED
 #define TclOONewForwardInstanceMethod_TCL_DECLARED
 /* 8 */
-EXTERN Method *		TclOONewForwardInstanceMethod (Tcl_Interp * interp,
-				Object * oPtr, int isPublic,
-				Tcl_Obj * nameObj, Tcl_Obj * prefixObj);
+EXTERN Method *		TclOONewForwardInstanceMethod(Tcl_Interp *interp,
+				Object *oPtr, int isPublic, Tcl_Obj *nameObj,
+				Tcl_Obj *prefixObj);
 #endif
 #ifndef TclOONewProcInstanceMethodEx_TCL_DECLARED
 #define TclOONewProcInstanceMethodEx_TCL_DECLARED
 /* 9 */
-EXTERN Tcl_Method	TclOONewProcInstanceMethodEx (Tcl_Interp * interp,
+EXTERN Tcl_Method	TclOONewProcInstanceMethodEx(Tcl_Interp *interp,
 				Tcl_Object oPtr,
 				TclOO_PreCallProc preCallPtr,
 				TclOO_PostCallProc postCallPtr,
 				ProcErrorProc errProc, ClientData clientData,
-				Tcl_Obj * nameObj, Tcl_Obj * argsObj,
-				Tcl_Obj * bodyObj, int flags,
-				void ** internalTokenPtr);
+				Tcl_Obj *nameObj, Tcl_Obj *argsObj,
+				Tcl_Obj *bodyObj, int flags,
+				void **internalTokenPtr);
 #endif
 #ifndef TclOONewProcMethodEx_TCL_DECLARED
 #define TclOONewProcMethodEx_TCL_DECLARED
 /* 10 */
-EXTERN Tcl_Method	TclOONewProcMethodEx (Tcl_Interp * interp,
+EXTERN Tcl_Method	TclOONewProcMethodEx(Tcl_Interp *interp,
 				Tcl_Class clsPtr,
 				TclOO_PreCallProc preCallPtr,
 				TclOO_PostCallProc postCallPtr,
 				ProcErrorProc errProc, ClientData clientData,
-				Tcl_Obj * nameObj, Tcl_Obj * argsObj,
-				Tcl_Obj * bodyObj, int flags,
-				void ** internalTokenPtr);
+				Tcl_Obj *nameObj, Tcl_Obj *argsObj,
+				Tcl_Obj *bodyObj, int flags,
+				void **internalTokenPtr);
 #endif
 #ifndef TclOOInvokeObject_TCL_DECLARED
 #define TclOOInvokeObject_TCL_DECLARED
 /* 11 */
-EXTERN int		TclOOInvokeObject (Tcl_Interp * interp,
+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);
+EXTERN void		TclOOObjectSetFilters(Object *oPtr, int numFilters,
+				Tcl_Obj *const *filters);
 #endif
 #ifndef TclOOClassSetFilters_TCL_DECLARED
 #define TclOOClassSetFilters_TCL_DECLARED
 /* 13 */
-EXTERN void		TclOOClassSetFilters (Tcl_Interp * interp,
-				Class * classPtr, int numFilters,
-				Tcl_Obj *const * filters);
+EXTERN void		TclOOClassSetFilters(Tcl_Interp *interp,
+				Class *classPtr, int numFilters,
+				Tcl_Obj *const *filters);
 #endif
 #ifndef TclOOObjectSetMixins_TCL_DECLARED
 #define TclOOObjectSetMixins_TCL_DECLARED
 /* 14 */
-EXTERN void		TclOOObjectSetMixins (Object * oPtr, int numMixins,
-				Class *const * mixins);
+EXTERN void		TclOOObjectSetMixins(Object *oPtr, int numMixins,
+				Class *const *mixins);
 #endif
 #ifndef TclOOClassSetMixins_TCL_DECLARED
 #define TclOOClassSetMixins_TCL_DECLARED
 /* 15 */
-EXTERN void		TclOOClassSetMixins (Tcl_Interp * interp,
-				Class * classPtr, int numMixins,
-				Class *const * mixins);
+EXTERN void		TclOOClassSetMixins(Tcl_Interp *interp,
+				Class *classPtr, int numMixins,
+				Class *const *mixins);
 #endif
 
 typedef struct TclOOIntStubs {
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index bcd8fc3..1dddbaf 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -6,7 +6,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.35 2010/01/13 06:46:56 nijtmans Exp $
+ * RCS: @(#) $Id: tclPlatDecls.h,v 1.36 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #ifndef _TCLPLATDECLS
@@ -51,32 +51,32 @@
 #ifndef Tcl_WinUtfToTChar_TCL_DECLARED
 #define Tcl_WinUtfToTChar_TCL_DECLARED
 /* 0 */
-EXTERN TCHAR *		Tcl_WinUtfToTChar (const char * str, int len,
-				Tcl_DString * dsPtr);
+EXTERN TCHAR *		Tcl_WinUtfToTChar(const char *str, int len,
+				Tcl_DString *dsPtr);
 #endif
 #ifndef Tcl_WinTCharToUtf_TCL_DECLARED
 #define Tcl_WinTCharToUtf_TCL_DECLARED
 /* 1 */
-EXTERN char *		Tcl_WinTCharToUtf (const TCHAR * str, int len,
-				Tcl_DString * dsPtr);
+EXTERN char *		Tcl_WinTCharToUtf(const TCHAR *str, int len,
+				Tcl_DString *dsPtr);
 #endif
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
 #ifndef Tcl_MacOSXOpenBundleResources_TCL_DECLARED
 #define Tcl_MacOSXOpenBundleResources_TCL_DECLARED
 /* 0 */
-EXTERN int		Tcl_MacOSXOpenBundleResources (Tcl_Interp * interp,
-				const char * bundleName, int hasResourceFile,
-				int maxPathLen, char * libraryPath);
+EXTERN int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
+				const char *bundleName, int hasResourceFile,
+				int maxPathLen, char *libraryPath);
 #endif
 #ifndef Tcl_MacOSXOpenVersionedBundleResources_TCL_DECLARED
 #define Tcl_MacOSXOpenVersionedBundleResources_TCL_DECLARED
 /* 1 */
-EXTERN int		Tcl_MacOSXOpenVersionedBundleResources (
-				Tcl_Interp * interp, const char * bundleName,
-				const char * bundleVersion,
+EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
+				Tcl_Interp *interp, const char *bundleName,
+				const char *bundleVersion,
 				int hasResourceFile, int maxPathLen,
-				char * libraryPath);
+				char *libraryPath);
 #endif
 #endif /* MACOSX */
 
diff --git a/generic/tclResolve.c b/generic/tclResolve.c
index 8455793..7a86427 100644
--- a/generic/tclResolve.c
+++ b/generic/tclResolve.c
@@ -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: tclResolve.c,v 1.11 2009/07/15 13:17:19 dkf Exp $
+ * RCS: @(#) $Id: tclResolve.c,v 1.12 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -294,7 +294,7 @@ BumpCmdRefEpochs(
  *
  *	Command resolution is handled by a function of the following type:
  *
- *	  typedef int (*Tcl_ResolveCmdProc)(Tcl_Interp *interp,
+ *	  typedef int (Tcl_ResolveCmdProc)(Tcl_Interp *interp,
  *		  const char *name, Tcl_Namespace *context,
  *		  int flags, Tcl_Command *rPtr);
  *
@@ -309,7 +309,7 @@ BumpCmdRefEpochs(
  *	Variable resolution is handled by two functions. The first is called
  *	whenever a variable needs to be resolved at compile time:
  *
- *	  typedef int (*Tcl_ResolveCompiledVarProc)(Tcl_Interp *interp,
+ *	  typedef int (Tcl_ResolveCompiledVarProc)(Tcl_Interp *interp,
  *		  const char *name, Tcl_Namespace *context,
  *		  Tcl_ResolvedVarInfo *rPtr);
  *
@@ -325,7 +325,7 @@ BumpCmdRefEpochs(
  *	the variable may be requested via Tcl_FindNamespaceVar.) This function
  *	has the following type:
  *
- *	  typedef int (*Tcl_ResolveVarProc)(Tcl_Interp *interp,
+ *	  typedef int (Tcl_ResolveVarProc)(Tcl_Interp *interp,
  *		  const char *name, Tcl_Namespace *context,
  *		  int flags, Tcl_Var *rPtr);
  *
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index ec91aad..a170de8 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.5 2008/10/22 20:23:59 nijtmans Exp $
+# RCS: @(#) $Id: tclTomMath.decls,v 1.6 2010/01/29 16:17:20 nijtmans Exp $
 
 library tcl
 
@@ -32,184 +32,184 @@ declare 1 generic {
 }
 
 declare 2 generic {
-    int TclBN_mp_add(mp_int* a, mp_int* b, mp_int* c)
+    int TclBN_mp_add(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 3 generic {
-    int TclBN_mp_add_d(mp_int* a, mp_digit b, mp_int* c)
+    int TclBN_mp_add_d(mp_int *a, mp_digit b, mp_int *c)
 }
 declare 4 generic {
-    int TclBN_mp_and(mp_int* a, mp_int* b, mp_int* c)
+    int TclBN_mp_and(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 5 generic {
-    void TclBN_mp_clamp(mp_int* a)
+    void TclBN_mp_clamp(mp_int *a)
 }
 declare 6 generic {
-    void TclBN_mp_clear(mp_int* a)
+    void TclBN_mp_clear(mp_int *a)
 }
 declare 7 generic {
-    void TclBN_mp_clear_multi(mp_int* a, ...)
+    void TclBN_mp_clear_multi(mp_int *a, ...)
 }
 declare 8 generic {
-    int TclBN_mp_cmp(mp_int* a, mp_int* b)
+    int TclBN_mp_cmp(mp_int *a, mp_int *b)
 }
 declare 9 generic {
-    int TclBN_mp_cmp_d(mp_int* a, mp_digit b)
+    int TclBN_mp_cmp_d(mp_int *a, mp_digit b)
 }
 declare 10 generic {
-    int TclBN_mp_cmp_mag(mp_int* a, mp_int* b)
+    int TclBN_mp_cmp_mag(mp_int *a, mp_int *b)
 }
 declare 11 generic {
-    int TclBN_mp_copy(mp_int* a, mp_int* b)
+    int TclBN_mp_copy(mp_int *a, mp_int *b)
 }
 declare 12 generic {
-    int TclBN_mp_count_bits(mp_int* a)
+    int TclBN_mp_count_bits(mp_int *a)
 }
 declare 13 generic {
-    int TclBN_mp_div(mp_int* a, mp_int* b, mp_int* q, mp_int* r)
+    int TclBN_mp_div(mp_int *a, mp_int *b, mp_int *q, mp_int *r)
 }
 declare 14 generic {
-    int TclBN_mp_div_d(mp_int* a, mp_digit b, mp_int* q, mp_digit* r)
+    int TclBN_mp_div_d(mp_int *a, mp_digit b, mp_int *q, mp_digit *r)
 }
 declare 15 generic {
-    int TclBN_mp_div_2(mp_int* a, mp_int* q)
+    int TclBN_mp_div_2(mp_int *a, mp_int *q)
 }
 declare 16 generic {
-    int TclBN_mp_div_2d(mp_int* a, int b, mp_int* q, mp_int* r)
+    int TclBN_mp_div_2d(mp_int *a, int b, mp_int *q, mp_int *r)
 }
 declare 17 generic {
-    int TclBN_mp_div_3(mp_int* a, mp_int* q, mp_digit* r)
+    int TclBN_mp_div_3(mp_int *a, mp_int *q, mp_digit *r)
 }
 declare 18 generic {
-    void TclBN_mp_exch(mp_int* a, mp_int* b)
+    void TclBN_mp_exch(mp_int *a, mp_int *b)
 }
 declare 19 generic {
-    int TclBN_mp_expt_d(mp_int* a, mp_digit b, mp_int* c)
+    int TclBN_mp_expt_d(mp_int *a, mp_digit b, mp_int *c)
 }
 declare 20 generic {
-    int TclBN_mp_grow(mp_int* a, int size)
+    int TclBN_mp_grow(mp_int *a, int size)
 }
 declare 21 generic {
-    int TclBN_mp_init(mp_int* a)
+    int TclBN_mp_init(mp_int *a)
 }
 declare 22 generic {
-    int TclBN_mp_init_copy(mp_int * a, mp_int* b)
+    int TclBN_mp_init_copy(mp_int *a, mp_int *b)
 }
 declare 23 generic {
-    int TclBN_mp_init_multi(mp_int* a, ...)
+    int TclBN_mp_init_multi(mp_int *a, ...)
 }
 declare 24 generic {
-    int TclBN_mp_init_set(mp_int* a, mp_digit b)
+    int TclBN_mp_init_set(mp_int *a, mp_digit b)
 }
 declare 25 generic {
-    int TclBN_mp_init_size(mp_int* a, int size)
+    int TclBN_mp_init_size(mp_int *a, int size)
 }
 declare 26 generic {
-    int TclBN_mp_lshd(mp_int* a, int shift)
+    int TclBN_mp_lshd(mp_int *a, int shift)
 }
 declare 27 generic {
-    int TclBN_mp_mod(mp_int* a, mp_int* b, mp_int* r)
+    int TclBN_mp_mod(mp_int *a, mp_int *b, mp_int *r)
 }
 declare 28 generic {
-    int TclBN_mp_mod_2d(mp_int* a, int b, mp_int* r)
+    int TclBN_mp_mod_2d(mp_int *a, int b, mp_int *r)
 }
 declare 29 generic {
-    int TclBN_mp_mul(mp_int* a, mp_int* b, mp_int* p)
+    int TclBN_mp_mul(mp_int *a, mp_int *b, mp_int *p)
 }
 declare 30 generic {
-    int TclBN_mp_mul_d(mp_int* a, mp_digit b, mp_int* p)
+    int TclBN_mp_mul_d(mp_int *a, mp_digit b, mp_int *p)
 }
 declare 31 generic {
-    int TclBN_mp_mul_2(mp_int* a, mp_int* p)
+    int TclBN_mp_mul_2(mp_int *a, mp_int *p)
 }
 declare 32 generic {
-    int TclBN_mp_mul_2d(mp_int* a, int d, mp_int* p)
+    int TclBN_mp_mul_2d(mp_int *a, int d, mp_int *p)
 }
 declare 33 generic {
-    int TclBN_mp_neg(mp_int* a, mp_int* b)
+    int TclBN_mp_neg(mp_int *a, mp_int *b)
 }
 declare 34 generic {
-    int TclBN_mp_or(mp_int* a, mp_int* b, mp_int* c)
+    int TclBN_mp_or(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 35 generic {
-    int TclBN_mp_radix_size(mp_int* a, int radix, int* size)
+    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)
+    void TclBN_mp_rshd(mp_int *a, int shift)
 }
 declare 38 generic {
-    int TclBN_mp_shrink(mp_int* a)
+    int TclBN_mp_shrink(mp_int *a)
 }
 declare 39 generic {
-    void TclBN_mp_set(mp_int* a, mp_digit b)
+    void TclBN_mp_set(mp_int *a, mp_digit b)
 }
 declare 40 generic {
-    int TclBN_mp_sqr(mp_int* a, mp_int* b)
+    int TclBN_mp_sqr(mp_int *a, mp_int *b)
 }
 declare 41 generic {
-    int TclBN_mp_sqrt(mp_int* a, mp_int* b)
+    int TclBN_mp_sqrt(mp_int *a, mp_int *b)
 }
 declare 42 generic {
-    int TclBN_mp_sub(mp_int* a, mp_int* b, mp_int* c)
+    int TclBN_mp_sub(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 43 generic {
-    int TclBN_mp_sub_d(mp_int* a, mp_digit b, mp_int* c)
+    int TclBN_mp_sub_d(mp_int *a, mp_digit b, mp_int *c)
 }
 declare 44 generic {
-    int TclBN_mp_to_unsigned_bin(mp_int* a, unsigned char* b)
+    int TclBN_mp_to_unsigned_bin(mp_int *a, unsigned char *b)
 }
 declare 45 generic {
-    int TclBN_mp_to_unsigned_bin_n(mp_int* a, unsigned char* b,
-	    unsigned long* outlen)
+    int TclBN_mp_to_unsigned_bin_n(mp_int *a, unsigned char *b,
+	    unsigned long *outlen)
 }
 declare 46 generic {
-    int TclBN_mp_toradix_n(mp_int* a, char* str, int radix, int maxlen)
+    int TclBN_mp_toradix_n(mp_int *a, char *str, int radix, int maxlen)
 }
 declare 47 generic {
-    int TclBN_mp_unsigned_bin_size(mp_int* a)
+    int TclBN_mp_unsigned_bin_size(mp_int *a)
 }
 declare 48 generic {
-    int TclBN_mp_xor(mp_int* a, mp_int* b, mp_int* c)
+    int TclBN_mp_xor(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 49 generic {
-    void TclBN_mp_zero(mp_int* a)
+    void TclBN_mp_zero(mp_int *a)
 }
 
 # internal routines to libtommath - should not be called but must be
 # exported to accommodate the "tommath" extension
 
 declare 50 generic {
-    void TclBN_reverse(unsigned char* s, int len)
+    void TclBN_reverse(unsigned char *s, int len)
 }
 declare 51 generic {
     int TclBN_fast_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs)
 }
 declare 52 generic {
-    int TclBN_fast_s_mp_sqr(mp_int* a, mp_int* b)
+    int TclBN_fast_s_mp_sqr(mp_int *a, mp_int *b)
 }
 declare 53 generic {
-    int TclBN_mp_karatsuba_mul(mp_int* a, mp_int* b, mp_int* c)
+    int TclBN_mp_karatsuba_mul(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 54 generic {
-    int TclBN_mp_karatsuba_sqr(mp_int* a, mp_int* b)
+    int TclBN_mp_karatsuba_sqr(mp_int *a, mp_int *b)
 }
 declare 55 generic {
-    int TclBN_mp_toom_mul(mp_int* a, mp_int* b, mp_int* c)
+    int TclBN_mp_toom_mul(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 56 generic {
-    int TclBN_mp_toom_sqr(mp_int* a, mp_int* b)
+    int TclBN_mp_toom_sqr(mp_int *a, mp_int *b)
 }
 declare 57 generic {
-    int TclBN_s_mp_add(mp_int* a, mp_int* b, mp_int* c)
+    int TclBN_s_mp_add(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 58 generic {
-    int TclBN_s_mp_mul_digs(mp_int* a, mp_int* b, mp_int* c, int digs)
+    int TclBN_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs)
 }
 declare 59 generic {
-    int TclBN_s_mp_sqr(mp_int* a, mp_int* b)
+    int TclBN_s_mp_sqr(mp_int *a, mp_int *b)
 }
 declare 60 generic {
-    int TclBN_s_mp_sub(mp_int* a, mp_int* b, mp_int* c)
+    int TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c)
 }
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 68521ca..76f6b20 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.9 2008/10/22 20:23:59 nijtmans Exp $
+ * RCS: @(#) $Id: tclTomMathDecls.h,v 1.10 2010/01/29 16:17:20 nijtmans Exp $
  */
 
 #ifndef _TCLTOMMATHDECLS
@@ -140,317 +140,316 @@
 #ifndef TclBN_epoch_TCL_DECLARED
 #define TclBN_epoch_TCL_DECLARED
 /* 0 */
-EXTERN int		TclBN_epoch (void);
+EXTERN int		TclBN_epoch(void);
 #endif
 #ifndef TclBN_revision_TCL_DECLARED
 #define TclBN_revision_TCL_DECLARED
 /* 1 */
-EXTERN int		TclBN_revision (void);
+EXTERN int		TclBN_revision(void);
 #endif
 #ifndef TclBN_mp_add_TCL_DECLARED
 #define TclBN_mp_add_TCL_DECLARED
 /* 2 */
-EXTERN int		TclBN_mp_add (mp_int* a, mp_int* b, mp_int* c);
+EXTERN int		TclBN_mp_add(mp_int *a, mp_int *b, mp_int *c);
 #endif
 #ifndef TclBN_mp_add_d_TCL_DECLARED
 #define TclBN_mp_add_d_TCL_DECLARED
 /* 3 */
-EXTERN int		TclBN_mp_add_d (mp_int* a, mp_digit b, mp_int* c);
+EXTERN int		TclBN_mp_add_d(mp_int *a, mp_digit b, mp_int *c);
 #endif
 #ifndef TclBN_mp_and_TCL_DECLARED
 #define TclBN_mp_and_TCL_DECLARED
 /* 4 */
-EXTERN int		TclBN_mp_and (mp_int* a, mp_int* b, mp_int* c);
+EXTERN int		TclBN_mp_and(mp_int *a, mp_int *b, mp_int *c);
 #endif
 #ifndef TclBN_mp_clamp_TCL_DECLARED
 #define TclBN_mp_clamp_TCL_DECLARED
 /* 5 */
-EXTERN void		TclBN_mp_clamp (mp_int* a);
+EXTERN void		TclBN_mp_clamp(mp_int *a);
 #endif
 #ifndef TclBN_mp_clear_TCL_DECLARED
 #define TclBN_mp_clear_TCL_DECLARED
 /* 6 */
-EXTERN void		TclBN_mp_clear (mp_int* a);
+EXTERN void		TclBN_mp_clear(mp_int *a);
 #endif
 #ifndef TclBN_mp_clear_multi_TCL_DECLARED
 #define TclBN_mp_clear_multi_TCL_DECLARED
 /* 7 */
-EXTERN void		TclBN_mp_clear_multi (mp_int* a, ...);
+EXTERN void		TclBN_mp_clear_multi(mp_int *a, ...);
 #endif
 #ifndef TclBN_mp_cmp_TCL_DECLARED
 #define TclBN_mp_cmp_TCL_DECLARED
 /* 8 */
-EXTERN int		TclBN_mp_cmp (mp_int* a, mp_int* b);
+EXTERN int		TclBN_mp_cmp(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_cmp_d_TCL_DECLARED
 #define TclBN_mp_cmp_d_TCL_DECLARED
 /* 9 */
-EXTERN int		TclBN_mp_cmp_d (mp_int* a, mp_digit b);
+EXTERN int		TclBN_mp_cmp_d(mp_int *a, mp_digit b);
 #endif
 #ifndef TclBN_mp_cmp_mag_TCL_DECLARED
 #define TclBN_mp_cmp_mag_TCL_DECLARED
 /* 10 */
-EXTERN int		TclBN_mp_cmp_mag (mp_int* a, mp_int* b);
+EXTERN int		TclBN_mp_cmp_mag(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_copy_TCL_DECLARED
 #define TclBN_mp_copy_TCL_DECLARED
 /* 11 */
-EXTERN int		TclBN_mp_copy (mp_int* a, mp_int* b);
+EXTERN int		TclBN_mp_copy(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_count_bits_TCL_DECLARED
 #define TclBN_mp_count_bits_TCL_DECLARED
 /* 12 */
-EXTERN int		TclBN_mp_count_bits (mp_int* a);
+EXTERN int		TclBN_mp_count_bits(mp_int *a);
 #endif
 #ifndef TclBN_mp_div_TCL_DECLARED
 #define TclBN_mp_div_TCL_DECLARED
 /* 13 */
-EXTERN int		TclBN_mp_div (mp_int* a, mp_int* b, mp_int* q,
-				mp_int* r);
+EXTERN int		TclBN_mp_div(mp_int *a, mp_int *b, mp_int *q,
+				mp_int *r);
 #endif
 #ifndef TclBN_mp_div_d_TCL_DECLARED
 #define TclBN_mp_div_d_TCL_DECLARED
 /* 14 */
-EXTERN int		TclBN_mp_div_d (mp_int* a, mp_digit b, mp_int* q,
-				mp_digit* r);
+EXTERN int		TclBN_mp_div_d(mp_int *a, mp_digit b, mp_int *q,
+				mp_digit*r);
 #endif
 #ifndef TclBN_mp_div_2_TCL_DECLARED
 #define TclBN_mp_div_2_TCL_DECLARED
 /* 15 */
-EXTERN int		TclBN_mp_div_2 (mp_int* a, mp_int* q);
+EXTERN int		TclBN_mp_div_2(mp_int *a, mp_int *q);
 #endif
 #ifndef TclBN_mp_div_2d_TCL_DECLARED
 #define TclBN_mp_div_2d_TCL_DECLARED
 /* 16 */
-EXTERN int		TclBN_mp_div_2d (mp_int* a, int b, mp_int* q,
-				mp_int* r);
+EXTERN int		TclBN_mp_div_2d(mp_int *a, int b, mp_int *q,
+				mp_int *r);
 #endif
 #ifndef TclBN_mp_div_3_TCL_DECLARED
 #define TclBN_mp_div_3_TCL_DECLARED
 /* 17 */
-EXTERN int		TclBN_mp_div_3 (mp_int* a, mp_int* q, mp_digit* r);
+EXTERN int		TclBN_mp_div_3(mp_int *a, mp_int *q, mp_digit*r);
 #endif
 #ifndef TclBN_mp_exch_TCL_DECLARED
 #define TclBN_mp_exch_TCL_DECLARED
 /* 18 */
-EXTERN void		TclBN_mp_exch (mp_int* a, mp_int* b);
+EXTERN void		TclBN_mp_exch(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_expt_d_TCL_DECLARED
 #define TclBN_mp_expt_d_TCL_DECLARED
 /* 19 */
-EXTERN int		TclBN_mp_expt_d (mp_int* a, mp_digit b, mp_int* c);
+EXTERN int		TclBN_mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
 #endif
 #ifndef TclBN_mp_grow_TCL_DECLARED
 #define TclBN_mp_grow_TCL_DECLARED
 /* 20 */
-EXTERN int		TclBN_mp_grow (mp_int* a, int size);
+EXTERN int		TclBN_mp_grow(mp_int *a, int size);
 #endif
 #ifndef TclBN_mp_init_TCL_DECLARED
 #define TclBN_mp_init_TCL_DECLARED
 /* 21 */
-EXTERN int		TclBN_mp_init (mp_int* a);
+EXTERN int		TclBN_mp_init(mp_int *a);
 #endif
 #ifndef TclBN_mp_init_copy_TCL_DECLARED
 #define TclBN_mp_init_copy_TCL_DECLARED
 /* 22 */
-EXTERN int		TclBN_mp_init_copy (mp_int * a, mp_int* b);
+EXTERN int		TclBN_mp_init_copy(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_init_multi_TCL_DECLARED
 #define TclBN_mp_init_multi_TCL_DECLARED
 /* 23 */
-EXTERN int		TclBN_mp_init_multi (mp_int* a, ...);
+EXTERN int		TclBN_mp_init_multi(mp_int *a, ...);
 #endif
 #ifndef TclBN_mp_init_set_TCL_DECLARED
 #define TclBN_mp_init_set_TCL_DECLARED
 /* 24 */
-EXTERN int		TclBN_mp_init_set (mp_int* a, mp_digit b);
+EXTERN int		TclBN_mp_init_set(mp_int *a, mp_digit b);
 #endif
 #ifndef TclBN_mp_init_size_TCL_DECLARED
 #define TclBN_mp_init_size_TCL_DECLARED
 /* 25 */
-EXTERN int		TclBN_mp_init_size (mp_int* a, int size);
+EXTERN int		TclBN_mp_init_size(mp_int *a, int size);
 #endif
 #ifndef TclBN_mp_lshd_TCL_DECLARED
 #define TclBN_mp_lshd_TCL_DECLARED
 /* 26 */
-EXTERN int		TclBN_mp_lshd (mp_int* a, int shift);
+EXTERN int		TclBN_mp_lshd(mp_int *a, int shift);
 #endif
 #ifndef TclBN_mp_mod_TCL_DECLARED
 #define TclBN_mp_mod_TCL_DECLARED
 /* 27 */
-EXTERN int		TclBN_mp_mod (mp_int* a, mp_int* b, mp_int* r);
+EXTERN int		TclBN_mp_mod(mp_int *a, mp_int *b, mp_int *r);
 #endif
 #ifndef TclBN_mp_mod_2d_TCL_DECLARED
 #define TclBN_mp_mod_2d_TCL_DECLARED
 /* 28 */
-EXTERN int		TclBN_mp_mod_2d (mp_int* a, int b, mp_int* r);
+EXTERN int		TclBN_mp_mod_2d(mp_int *a, int b, mp_int *r);
 #endif
 #ifndef TclBN_mp_mul_TCL_DECLARED
 #define TclBN_mp_mul_TCL_DECLARED
 /* 29 */
-EXTERN int		TclBN_mp_mul (mp_int* a, mp_int* b, mp_int* p);
+EXTERN int		TclBN_mp_mul(mp_int *a, mp_int *b, mp_int *p);
 #endif
 #ifndef TclBN_mp_mul_d_TCL_DECLARED
 #define TclBN_mp_mul_d_TCL_DECLARED
 /* 30 */
-EXTERN int		TclBN_mp_mul_d (mp_int* a, mp_digit b, mp_int* p);
+EXTERN int		TclBN_mp_mul_d(mp_int *a, mp_digit b, mp_int *p);
 #endif
 #ifndef TclBN_mp_mul_2_TCL_DECLARED
 #define TclBN_mp_mul_2_TCL_DECLARED
 /* 31 */
-EXTERN int		TclBN_mp_mul_2 (mp_int* a, mp_int* p);
+EXTERN int		TclBN_mp_mul_2(mp_int *a, mp_int *p);
 #endif
 #ifndef TclBN_mp_mul_2d_TCL_DECLARED
 #define TclBN_mp_mul_2d_TCL_DECLARED
 /* 32 */
-EXTERN int		TclBN_mp_mul_2d (mp_int* a, int d, mp_int* p);
+EXTERN int		TclBN_mp_mul_2d(mp_int *a, int d, mp_int *p);
 #endif
 #ifndef TclBN_mp_neg_TCL_DECLARED
 #define TclBN_mp_neg_TCL_DECLARED
 /* 33 */
-EXTERN int		TclBN_mp_neg (mp_int* a, mp_int* b);
+EXTERN int		TclBN_mp_neg(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_or_TCL_DECLARED
 #define TclBN_mp_or_TCL_DECLARED
 /* 34 */
-EXTERN int		TclBN_mp_or (mp_int* a, mp_int* b, mp_int* c);
+EXTERN int		TclBN_mp_or(mp_int *a, mp_int *b, mp_int *c);
 #endif
 #ifndef TclBN_mp_radix_size_TCL_DECLARED
 #define TclBN_mp_radix_size_TCL_DECLARED
 /* 35 */
-EXTERN int		TclBN_mp_radix_size (mp_int* a, int radix, int* size);
+EXTERN int		TclBN_mp_radix_size(mp_int *a, int radix, int*size);
 #endif
 #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
 #define TclBN_mp_rshd_TCL_DECLARED
 /* 37 */
-EXTERN void		TclBN_mp_rshd (mp_int * a, int shift);
+EXTERN void		TclBN_mp_rshd(mp_int *a, int shift);
 #endif
 #ifndef TclBN_mp_shrink_TCL_DECLARED
 #define TclBN_mp_shrink_TCL_DECLARED
 /* 38 */
-EXTERN int		TclBN_mp_shrink (mp_int* a);
+EXTERN int		TclBN_mp_shrink(mp_int *a);
 #endif
 #ifndef TclBN_mp_set_TCL_DECLARED
 #define TclBN_mp_set_TCL_DECLARED
 /* 39 */
-EXTERN void		TclBN_mp_set (mp_int* a, mp_digit b);
+EXTERN void		TclBN_mp_set(mp_int *a, mp_digit b);
 #endif
 #ifndef TclBN_mp_sqr_TCL_DECLARED
 #define TclBN_mp_sqr_TCL_DECLARED
 /* 40 */
-EXTERN int		TclBN_mp_sqr (mp_int* a, mp_int* b);
+EXTERN int		TclBN_mp_sqr(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_sqrt_TCL_DECLARED
 #define TclBN_mp_sqrt_TCL_DECLARED
 /* 41 */
-EXTERN int		TclBN_mp_sqrt (mp_int* a, mp_int* b);
+EXTERN int		TclBN_mp_sqrt(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_sub_TCL_DECLARED
 #define TclBN_mp_sub_TCL_DECLARED
 /* 42 */
-EXTERN int		TclBN_mp_sub (mp_int* a, mp_int* b, mp_int* c);
+EXTERN int		TclBN_mp_sub(mp_int *a, mp_int *b, mp_int *c);
 #endif
 #ifndef TclBN_mp_sub_d_TCL_DECLARED
 #define TclBN_mp_sub_d_TCL_DECLARED
 /* 43 */
-EXTERN int		TclBN_mp_sub_d (mp_int* a, mp_digit b, mp_int* c);
+EXTERN int		TclBN_mp_sub_d(mp_int *a, mp_digit b, mp_int *c);
 #endif
 #ifndef TclBN_mp_to_unsigned_bin_TCL_DECLARED
 #define TclBN_mp_to_unsigned_bin_TCL_DECLARED
 /* 44 */
-EXTERN int		TclBN_mp_to_unsigned_bin (mp_int* a,
-				unsigned char* b);
+EXTERN int		TclBN_mp_to_unsigned_bin(mp_int *a, unsigned char*b);
 #endif
 #ifndef TclBN_mp_to_unsigned_bin_n_TCL_DECLARED
 #define TclBN_mp_to_unsigned_bin_n_TCL_DECLARED
 /* 45 */
-EXTERN int		TclBN_mp_to_unsigned_bin_n (mp_int* a,
-				unsigned char* b, unsigned long* outlen);
+EXTERN int		TclBN_mp_to_unsigned_bin_n(mp_int *a,
+				unsigned char*b, unsigned long*outlen);
 #endif
 #ifndef TclBN_mp_toradix_n_TCL_DECLARED
 #define TclBN_mp_toradix_n_TCL_DECLARED
 /* 46 */
-EXTERN int		TclBN_mp_toradix_n (mp_int* a, char* str, int radix,
+EXTERN int		TclBN_mp_toradix_n(mp_int *a, char*str, int radix,
 				int maxlen);
 #endif
 #ifndef TclBN_mp_unsigned_bin_size_TCL_DECLARED
 #define TclBN_mp_unsigned_bin_size_TCL_DECLARED
 /* 47 */
-EXTERN int		TclBN_mp_unsigned_bin_size (mp_int* a);
+EXTERN int		TclBN_mp_unsigned_bin_size(mp_int *a);
 #endif
 #ifndef TclBN_mp_xor_TCL_DECLARED
 #define TclBN_mp_xor_TCL_DECLARED
 /* 48 */
-EXTERN int		TclBN_mp_xor (mp_int* a, mp_int* b, mp_int* c);
+EXTERN int		TclBN_mp_xor(mp_int *a, mp_int *b, mp_int *c);
 #endif
 #ifndef TclBN_mp_zero_TCL_DECLARED
 #define TclBN_mp_zero_TCL_DECLARED
 /* 49 */
-EXTERN void		TclBN_mp_zero (mp_int* a);
+EXTERN void		TclBN_mp_zero(mp_int *a);
 #endif
 #ifndef TclBN_reverse_TCL_DECLARED
 #define TclBN_reverse_TCL_DECLARED
 /* 50 */
-EXTERN void		TclBN_reverse (unsigned char* s, int len);
+EXTERN void		TclBN_reverse(unsigned char*s, int len);
 #endif
 #ifndef TclBN_fast_s_mp_mul_digs_TCL_DECLARED
 #define TclBN_fast_s_mp_mul_digs_TCL_DECLARED
 /* 51 */
-EXTERN int		TclBN_fast_s_mp_mul_digs (mp_int * a, mp_int * b,
-				mp_int * c, int digs);
+EXTERN int		TclBN_fast_s_mp_mul_digs(mp_int *a, mp_int *b,
+				mp_int *c, int digs);
 #endif
 #ifndef TclBN_fast_s_mp_sqr_TCL_DECLARED
 #define TclBN_fast_s_mp_sqr_TCL_DECLARED
 /* 52 */
-EXTERN int		TclBN_fast_s_mp_sqr (mp_int* a, mp_int* b);
+EXTERN int		TclBN_fast_s_mp_sqr(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_karatsuba_mul_TCL_DECLARED
 #define TclBN_mp_karatsuba_mul_TCL_DECLARED
 /* 53 */
-EXTERN int		TclBN_mp_karatsuba_mul (mp_int* a, mp_int* b,
-				mp_int* c);
+EXTERN int		TclBN_mp_karatsuba_mul(mp_int *a, mp_int *b,
+				mp_int *c);
 #endif
 #ifndef TclBN_mp_karatsuba_sqr_TCL_DECLARED
 #define TclBN_mp_karatsuba_sqr_TCL_DECLARED
 /* 54 */
-EXTERN int		TclBN_mp_karatsuba_sqr (mp_int* a, mp_int* b);
+EXTERN int		TclBN_mp_karatsuba_sqr(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_mp_toom_mul_TCL_DECLARED
 #define TclBN_mp_toom_mul_TCL_DECLARED
 /* 55 */
-EXTERN int		TclBN_mp_toom_mul (mp_int* a, mp_int* b, mp_int* c);
+EXTERN int		TclBN_mp_toom_mul(mp_int *a, mp_int *b, mp_int *c);
 #endif
 #ifndef TclBN_mp_toom_sqr_TCL_DECLARED
 #define TclBN_mp_toom_sqr_TCL_DECLARED
 /* 56 */
-EXTERN int		TclBN_mp_toom_sqr (mp_int* a, mp_int* b);
+EXTERN int		TclBN_mp_toom_sqr(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_s_mp_add_TCL_DECLARED
 #define TclBN_s_mp_add_TCL_DECLARED
 /* 57 */
-EXTERN int		TclBN_s_mp_add (mp_int* a, mp_int* b, mp_int* c);
+EXTERN int		TclBN_s_mp_add(mp_int *a, mp_int *b, mp_int *c);
 #endif
 #ifndef TclBN_s_mp_mul_digs_TCL_DECLARED
 #define TclBN_s_mp_mul_digs_TCL_DECLARED
 /* 58 */
-EXTERN int		TclBN_s_mp_mul_digs (mp_int* a, mp_int* b, mp_int* c,
+EXTERN int		TclBN_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c,
 				int digs);
 #endif
 #ifndef TclBN_s_mp_sqr_TCL_DECLARED
 #define TclBN_s_mp_sqr_TCL_DECLARED
 /* 59 */
-EXTERN int		TclBN_s_mp_sqr (mp_int* a, mp_int* b);
+EXTERN int		TclBN_s_mp_sqr(mp_int *a, mp_int *b);
 #endif
 #ifndef TclBN_s_mp_sub_TCL_DECLARED
 #define TclBN_s_mp_sub_TCL_DECLARED
 /* 60 */
-EXTERN int		TclBN_s_mp_sub (mp_int* a, mp_int* b, mp_int* c);
+EXTERN int		TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c);
 #endif
 
 typedef struct TclTomMathStubs {
@@ -459,65 +458,65 @@ typedef struct TclTomMathStubs {
 
     int (*tclBN_epoch) (void); /* 0 */
     int (*tclBN_revision) (void); /* 1 */
-    int (*tclBN_mp_add) (mp_int* a, mp_int* b, mp_int* c); /* 2 */
-    int (*tclBN_mp_add_d) (mp_int* a, mp_digit b, mp_int* c); /* 3 */
-    int (*tclBN_mp_and) (mp_int* a, mp_int* b, mp_int* c); /* 4 */
-    void (*tclBN_mp_clamp) (mp_int* a); /* 5 */
-    void (*tclBN_mp_clear) (mp_int* a); /* 6 */
-    void (*tclBN_mp_clear_multi) (mp_int* a, ...); /* 7 */
-    int (*tclBN_mp_cmp) (mp_int* a, mp_int* b); /* 8 */
-    int (*tclBN_mp_cmp_d) (mp_int* a, mp_digit b); /* 9 */
-    int (*tclBN_mp_cmp_mag) (mp_int* a, mp_int* b); /* 10 */
-    int (*tclBN_mp_copy) (mp_int* a, mp_int* b); /* 11 */
-    int (*tclBN_mp_count_bits) (mp_int* a); /* 12 */
-    int (*tclBN_mp_div) (mp_int* a, mp_int* b, mp_int* q, mp_int* r); /* 13 */
-    int (*tclBN_mp_div_d) (mp_int* a, mp_digit b, mp_int* q, mp_digit* r); /* 14 */
-    int (*tclBN_mp_div_2) (mp_int* a, mp_int* q); /* 15 */
-    int (*tclBN_mp_div_2d) (mp_int* a, int b, mp_int* q, mp_int* r); /* 16 */
-    int (*tclBN_mp_div_3) (mp_int* a, mp_int* q, mp_digit* r); /* 17 */
-    void (*tclBN_mp_exch) (mp_int* a, mp_int* b); /* 18 */
-    int (*tclBN_mp_expt_d) (mp_int* a, mp_digit b, mp_int* c); /* 19 */
-    int (*tclBN_mp_grow) (mp_int* a, int size); /* 20 */
-    int (*tclBN_mp_init) (mp_int* a); /* 21 */
-    int (*tclBN_mp_init_copy) (mp_int * a, mp_int* b); /* 22 */
-    int (*tclBN_mp_init_multi) (mp_int* a, ...); /* 23 */
-    int (*tclBN_mp_init_set) (mp_int* a, mp_digit b); /* 24 */
-    int (*tclBN_mp_init_size) (mp_int* a, int size); /* 25 */
-    int (*tclBN_mp_lshd) (mp_int* a, int shift); /* 26 */
-    int (*tclBN_mp_mod) (mp_int* a, mp_int* b, mp_int* r); /* 27 */
-    int (*tclBN_mp_mod_2d) (mp_int* a, int b, mp_int* r); /* 28 */
-    int (*tclBN_mp_mul) (mp_int* a, mp_int* b, mp_int* p); /* 29 */
-    int (*tclBN_mp_mul_d) (mp_int* a, mp_digit b, mp_int* p); /* 30 */
-    int (*tclBN_mp_mul_2) (mp_int* a, mp_int* p); /* 31 */
-    int (*tclBN_mp_mul_2d) (mp_int* a, int d, mp_int* p); /* 32 */
-    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_add) (mp_int * a, mp_int * b, mp_int * c); /* 2 */
+    int (*tclBN_mp_add_d) (mp_int * a, mp_digit b, mp_int * c); /* 3 */
+    int (*tclBN_mp_and) (mp_int * a, mp_int * b, mp_int * c); /* 4 */
+    void (*tclBN_mp_clamp) (mp_int * a); /* 5 */
+    void (*tclBN_mp_clear) (mp_int * a); /* 6 */
+    void (*tclBN_mp_clear_multi) (mp_int * a, ...); /* 7 */
+    int (*tclBN_mp_cmp) (mp_int * a, mp_int * b); /* 8 */
+    int (*tclBN_mp_cmp_d) (mp_int * a, mp_digit b); /* 9 */
+    int (*tclBN_mp_cmp_mag) (mp_int * a, mp_int * b); /* 10 */
+    int (*tclBN_mp_copy) (mp_int * a, mp_int * b); /* 11 */
+    int (*tclBN_mp_count_bits) (mp_int * a); /* 12 */
+    int (*tclBN_mp_div) (mp_int * a, mp_int * b, mp_int * q, mp_int * r); /* 13 */
+    int (*tclBN_mp_div_d) (mp_int * a, mp_digit b, mp_int * q, mp_digit* r); /* 14 */
+    int (*tclBN_mp_div_2) (mp_int * a, mp_int * q); /* 15 */
+    int (*tclBN_mp_div_2d) (mp_int * a, int b, mp_int * q, mp_int * r); /* 16 */
+    int (*tclBN_mp_div_3) (mp_int * a, mp_int * q, mp_digit* r); /* 17 */
+    void (*tclBN_mp_exch) (mp_int * a, mp_int * b); /* 18 */
+    int (*tclBN_mp_expt_d) (mp_int * a, mp_digit b, mp_int * c); /* 19 */
+    int (*tclBN_mp_grow) (mp_int * a, int size); /* 20 */
+    int (*tclBN_mp_init) (mp_int * a); /* 21 */
+    int (*tclBN_mp_init_copy) (mp_int * a, mp_int * b); /* 22 */
+    int (*tclBN_mp_init_multi) (mp_int * a, ...); /* 23 */
+    int (*tclBN_mp_init_set) (mp_int * a, mp_digit b); /* 24 */
+    int (*tclBN_mp_init_size) (mp_int * a, int size); /* 25 */
+    int (*tclBN_mp_lshd) (mp_int * a, int shift); /* 26 */
+    int (*tclBN_mp_mod) (mp_int * a, mp_int * b, mp_int * r); /* 27 */
+    int (*tclBN_mp_mod_2d) (mp_int * a, int b, mp_int * r); /* 28 */
+    int (*tclBN_mp_mul) (mp_int * a, mp_int * b, mp_int * p); /* 29 */
+    int (*tclBN_mp_mul_d) (mp_int * a, mp_digit b, mp_int * p); /* 30 */
+    int (*tclBN_mp_mul_2) (mp_int * a, mp_int * p); /* 31 */
+    int (*tclBN_mp_mul_2d) (mp_int * a, int d, mp_int * p); /* 32 */
+    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 */
     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 */
-    int (*tclBN_mp_sqr) (mp_int* a, mp_int* b); /* 40 */
-    int (*tclBN_mp_sqrt) (mp_int* a, mp_int* b); /* 41 */
-    int (*tclBN_mp_sub) (mp_int* a, mp_int* b, mp_int* c); /* 42 */
-    int (*tclBN_mp_sub_d) (mp_int* a, mp_digit b, mp_int* c); /* 43 */
-    int (*tclBN_mp_to_unsigned_bin) (mp_int* a, unsigned char* b); /* 44 */
-    int (*tclBN_mp_to_unsigned_bin_n) (mp_int* a, unsigned char* b, unsigned long* outlen); /* 45 */
-    int (*tclBN_mp_toradix_n) (mp_int* a, char* str, int radix, int maxlen); /* 46 */
-    int (*tclBN_mp_unsigned_bin_size) (mp_int* a); /* 47 */
-    int (*tclBN_mp_xor) (mp_int* a, mp_int* b, mp_int* c); /* 48 */
-    void (*tclBN_mp_zero) (mp_int* a); /* 49 */
+    int (*tclBN_mp_shrink) (mp_int * a); /* 38 */
+    void (*tclBN_mp_set) (mp_int * a, mp_digit b); /* 39 */
+    int (*tclBN_mp_sqr) (mp_int * a, mp_int * b); /* 40 */
+    int (*tclBN_mp_sqrt) (mp_int * a, mp_int * b); /* 41 */
+    int (*tclBN_mp_sub) (mp_int * a, mp_int * b, mp_int * c); /* 42 */
+    int (*tclBN_mp_sub_d) (mp_int * a, mp_digit b, mp_int * c); /* 43 */
+    int (*tclBN_mp_to_unsigned_bin) (mp_int * a, unsigned char* b); /* 44 */
+    int (*tclBN_mp_to_unsigned_bin_n) (mp_int * a, unsigned char* b, unsigned long* outlen); /* 45 */
+    int (*tclBN_mp_toradix_n) (mp_int * a, char* str, int radix, int maxlen); /* 46 */
+    int (*tclBN_mp_unsigned_bin_size) (mp_int * a); /* 47 */
+    int (*tclBN_mp_xor) (mp_int * a, mp_int * b, mp_int * c); /* 48 */
+    void (*tclBN_mp_zero) (mp_int * a); /* 49 */
     void (*tclBN_reverse) (unsigned char* s, int len); /* 50 */
     int (*tclBN_fast_s_mp_mul_digs) (mp_int * a, mp_int * b, mp_int * c, int digs); /* 51 */
-    int (*tclBN_fast_s_mp_sqr) (mp_int* a, mp_int* b); /* 52 */
-    int (*tclBN_mp_karatsuba_mul) (mp_int* a, mp_int* b, mp_int* c); /* 53 */
-    int (*tclBN_mp_karatsuba_sqr) (mp_int* a, mp_int* b); /* 54 */
-    int (*tclBN_mp_toom_mul) (mp_int* a, mp_int* b, mp_int* c); /* 55 */
-    int (*tclBN_mp_toom_sqr) (mp_int* a, mp_int* b); /* 56 */
-    int (*tclBN_s_mp_add) (mp_int* a, mp_int* b, mp_int* c); /* 57 */
-    int (*tclBN_s_mp_mul_digs) (mp_int* a, mp_int* b, mp_int* c, int digs); /* 58 */
-    int (*tclBN_s_mp_sqr) (mp_int* a, mp_int* b); /* 59 */
-    int (*tclBN_s_mp_sub) (mp_int* a, mp_int* b, mp_int* c); /* 60 */
+    int (*tclBN_fast_s_mp_sqr) (mp_int * a, mp_int * b); /* 52 */
+    int (*tclBN_mp_karatsuba_mul) (mp_int * a, mp_int * b, mp_int * c); /* 53 */
+    int (*tclBN_mp_karatsuba_sqr) (mp_int * a, mp_int * b); /* 54 */
+    int (*tclBN_mp_toom_mul) (mp_int * a, mp_int * b, mp_int * c); /* 55 */
+    int (*tclBN_mp_toom_sqr) (mp_int * a, mp_int * b); /* 56 */
+    int (*tclBN_s_mp_add) (mp_int * a, mp_int * b, mp_int * c); /* 57 */
+    int (*tclBN_s_mp_mul_digs) (mp_int * a, mp_int * b, mp_int * c, int digs); /* 58 */
+    int (*tclBN_s_mp_sqr) (mp_int * a, mp_int * b); /* 59 */
+    int (*tclBN_s_mp_sub) (mp_int * a, mp_int * b, mp_int * c); /* 60 */
 } TclTomMathStubs;
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index cfac1f6..3e33a74 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: genStubs.tcl,v 1.33 2009/12/02 20:45:16 nijtmans Exp $
+# RCS: @(#) $Id: genStubs.tcl,v 1.34 2010/01/29 16:17:21 nijtmans Exp $
 
 package require Tcl 8.4
 
@@ -425,7 +425,7 @@ proc genStubs::makeDecl {name decl index} {
 	append text ";\n"
 	return $text
     }
-    append line "$fname "
+    append line $fname
 
     set arg1 [lindex $args 0]
     switch -exact $arg1 {
@@ -437,8 +437,11 @@ proc genStubs::makeDecl {name decl index} {
 	    foreach arg [lrange $args 1 end] {
 		append line $sep
 		set next {}
-		append next [lindex $arg 0] " " [lindex $arg 1] \
-			[lindex $arg 2]
+		append next [lindex $arg 0]
+		if {[string index $next end] ne "*"} {
+		    append next " "
+		}
+		append next [lindex $arg 1] [lindex $arg 2]
 		if {[string length $line] + [string length $next] \
 			+ $pad > 76} {
 		    append text [string trimright $line] \n
@@ -455,8 +458,11 @@ proc genStubs::makeDecl {name decl index} {
 	    foreach arg $args {
 		append line $sep
 		set next {}
-		append next [lindex $arg 0] " " [lindex $arg 1] \
-			[lindex $arg 2]
+		append next [lindex $arg 0]
+		if {[string index $next end] ne "*"} {
+		    append next " "
+		}
+		append next [lindex $arg 1] [lindex $arg 2]
 		if {[string length $line] + [string length $next] \
 			+ $pad > 76} {
 		    append text [string trimright $line] \n