TIP#72 implementation. See ChangeLog for details.

This version builds clean on Solaris/SPARC, with GCC and CC, both with and
without threads and both in 32-bit and 64-bit mode.

1 files changed, 241 insertions, 219 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 9e6e3b4..915571e 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -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: tcl.decls,v 1.82 2002/02/10 20:36:33 kennykb Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.83 2002/02/15 14:28:48 dkf Exp $
 
 library tcl
 
@@ -29,12 +29,11 @@ hooks {tclPlat tclInt tclIntPlat}
 
 declare 0 generic {
     int Tcl_PkgProvideEx( Tcl_Interp* interp, CONST char* name,
-                          CONST char* version, ClientData clientData )
+	    CONST char* version, ClientData clientData )
 }
 declare 1 generic {
     CONST char * Tcl_PkgRequireEx( Tcl_Interp *interp, CONST char *name,
-                                   CONST char *version,
-	                           int exact, ClientData *clientDataPtr )
+	    CONST char *version, int exact, ClientData *clientDataPtr )
 }
 declare 2 generic {
     void Tcl_Panic(CONST char *format, ...)
@@ -56,7 +55,7 @@ declare 7 generic {
 }
 declare 8 generic {
     char * Tcl_DbCkrealloc(char *ptr, unsigned int size,
-                           CONST char *file, int line)
+	    CONST char *file, int line)
 }
 
 # Tcl_CreateFileHandler and Tcl_DeleteFileHandler are only available on unix,
@@ -64,7 +63,7 @@ declare 8 generic {
 # compatibility reasons.
 
 declare 9 unix {
-    void Tcl_CreateFileHandler(int fd, int mask, Tcl_FileProc *proc, \
+    void Tcl_CreateFileHandler(int fd, int mask, Tcl_FileProc *proc,
 	    ClientData clientData)
 }
 declare 10 unix {
@@ -93,7 +92,7 @@ declare 17 generic {
     Tcl_Obj * Tcl_ConcatObj(int objc, Tcl_Obj *CONST objv[])
 }
 declare 18 generic {
-    int Tcl_ConvertToType(Tcl_Interp *interp, Tcl_Obj *objPtr, \
+    int Tcl_ConvertToType(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    Tcl_ObjType *typePtr)
 }
 declare 19 generic {
@@ -109,16 +108,16 @@ declare 22 generic {
     Tcl_Obj * Tcl_DbNewBooleanObj(int boolValue, CONST char *file, int line)
 }
 declare 23 generic {
-    Tcl_Obj * Tcl_DbNewByteArrayObj(CONST unsigned char *bytes, int length, \
+    Tcl_Obj * Tcl_DbNewByteArrayObj(CONST unsigned char *bytes, int length,
 	    CONST char *file, int line)
 }
 declare 24 generic {
     Tcl_Obj * Tcl_DbNewDoubleObj(double doubleValue,
-                                 CONST char *file, int line)
+	    CONST char *file, int line)
 }
 declare 25 generic {
     Tcl_Obj * Tcl_DbNewListObj(int objc, Tcl_Obj *CONST *objv, 
-                               CONST char *file, int line)
+	    CONST char *file, int line)
 }
 declare 26 generic {
     Tcl_Obj * Tcl_DbNewLongObj(long longValue, CONST char *file, int line)
@@ -128,7 +127,7 @@ declare 27 generic {
 }
 declare 28 generic {
     Tcl_Obj * Tcl_DbNewStringObj(CONST char *bytes, int length,
-                                 CONST char *file, int line)
+	    CONST char *file, int line)
 }
 declare 29 generic {
     Tcl_Obj * Tcl_DuplicateObj(Tcl_Obj *objPtr)
@@ -140,7 +139,7 @@ declare 31 generic {
     int Tcl_GetBoolean(Tcl_Interp *interp, CONST char *str, int *boolPtr)
 }
 declare 32 generic {
-    int Tcl_GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
+    int Tcl_GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    int *boolPtr)
 }
 declare 33 generic {
@@ -150,11 +149,11 @@ declare 34 generic {
     int Tcl_GetDouble(Tcl_Interp *interp, CONST char *str, double *doublePtr)
 }
 declare 35 generic {
-    int Tcl_GetDoubleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
+    int Tcl_GetDoubleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    double *doublePtr)
 }
 declare 36 generic {
-    int Tcl_GetIndexFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
+    int Tcl_GetIndexFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    CONST84 char **tablePtr, CONST char *msg, int flags, int *indexPtr)
 }
 declare 37 generic {
@@ -176,34 +175,34 @@ declare 42 generic {
     void Tcl_InvalidateStringRep(Tcl_Obj *objPtr)
 }
 declare 43 generic {
-    int Tcl_ListObjAppendList(Tcl_Interp *interp, Tcl_Obj *listPtr, \
+    int Tcl_ListObjAppendList(Tcl_Interp *interp, Tcl_Obj *listPtr,
 	    Tcl_Obj *elemListPtr)
 }
 declare 44 generic {
-    int Tcl_ListObjAppendElement(Tcl_Interp *interp, Tcl_Obj *listPtr, \
+    int Tcl_ListObjAppendElement(Tcl_Interp *interp, Tcl_Obj *listPtr,
 	    Tcl_Obj *objPtr)
 }
 declare 45 generic {
-    int Tcl_ListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr, \
+    int Tcl_ListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
 	    int *objcPtr, Tcl_Obj ***objvPtr)
 }
 declare 46 generic {
-    int Tcl_ListObjIndex(Tcl_Interp *interp, Tcl_Obj *listPtr, int index, \
+    int Tcl_ListObjIndex(Tcl_Interp *interp, Tcl_Obj *listPtr, int index,
 	    Tcl_Obj **objPtrPtr)
 }
 declare 47 generic {
-    int Tcl_ListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr, int *intPtr)
+    int Tcl_ListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
+	    int *lengthPtr)
 }
 declare 48 generic {
-    int Tcl_ListObjReplace(Tcl_Interp *interp, Tcl_Obj *listPtr, int first, \
+    int Tcl_ListObjReplace(Tcl_Interp *interp, Tcl_Obj *listPtr, int first,
 	    int count, int objc, Tcl_Obj *CONST objv[])
 }
 declare 49 generic {
-    Tcl_Obj * Tcl_NewBooleanObj(int boolValue)
+    Tcl_Obj *Tcl_NewBooleanObj(int boolValue)
 }
 declare 50 generic {
-    Tcl_Obj * Tcl_NewByteArrayObj( CONST unsigned char* bytes,
-	                           int length )
+    Tcl_Obj *Tcl_NewByteArrayObj(CONST unsigned char* bytes, int length)
 }
 declare 51 generic {
     Tcl_Obj * Tcl_NewDoubleObj(double doubleValue)
@@ -231,7 +230,7 @@ declare 58 generic {
 }
 declare 59 generic {
     void Tcl_SetByteArrayObj(Tcl_Obj *objPtr, CONST unsigned char *bytes,
-                             int length)
+	    int length)
 }
 declare 60 generic {
     void Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue)
@@ -255,7 +254,7 @@ declare 66 generic {
     void Tcl_AddErrorInfo(Tcl_Interp *interp, CONST char *message)
 }
 declare 67 generic {
-    void Tcl_AddObjErrorInfo(Tcl_Interp *interp, CONST char *message, \
+    void Tcl_AddObjErrorInfo(Tcl_Interp *interp, CONST char *message,
 	    int length)
 }
 declare 68 generic {
@@ -268,7 +267,7 @@ declare 70 generic {
     void Tcl_AppendResult(Tcl_Interp *interp, ...)
 }
 declare 71 generic {
-    Tcl_AsyncHandler Tcl_AsyncCreate(Tcl_AsyncProc *proc, \
+    Tcl_AsyncHandler Tcl_AsyncCreate(Tcl_AsyncProc *proc,
 	    ClientData clientData)
 }
 declare 72 generic {
@@ -290,11 +289,11 @@ declare 77 generic {
     char Tcl_Backslash(CONST char *src, int *readPtr)
 }
 declare 78 generic {
-    int Tcl_BadChannelOption(Tcl_Interp *interp, CONST char *optionName, \
+    int Tcl_BadChannelOption(Tcl_Interp *interp, CONST char *optionName,
 	    CONST char *optionList)
 }
 declare 79 generic {
-    void Tcl_CallWhenDeleted(Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, \
+    void Tcl_CallWhenDeleted(Tcl_Interp *interp, Tcl_InterpDeleteProc *proc,
 	    ClientData clientData)
 }
 declare 80 generic {
@@ -313,17 +312,17 @@ declare 84 generic {
     int Tcl_ConvertElement(CONST char *src, char *dst, int flags)
 }
 declare 85 generic {
-    int Tcl_ConvertCountedElement(CONST char *src, int length, char *dst, \
+    int Tcl_ConvertCountedElement(CONST char *src, int length, char *dst,
 	    int flags)
 }
 declare 86 generic {
-    int Tcl_CreateAlias(Tcl_Interp *slave, CONST char *slaveCmd, \
-	    Tcl_Interp *target, CONST char *targetCmd, int argc, \
+    int Tcl_CreateAlias(Tcl_Interp *slave, CONST char *slaveCmd,
+	    Tcl_Interp *target, CONST char *targetCmd, int argc,
 	    char * CONST *argv)
 }
 declare 87 generic {
-    int Tcl_CreateAliasObj(Tcl_Interp *slave, CONST char *slaveCmd, \
-	    Tcl_Interp *target, CONST char *targetCmd, int objc, \
+    int Tcl_CreateAliasObj(Tcl_Interp *slave, CONST char *slaveCmd,
+	    Tcl_Interp *target, CONST char *targetCmd, int objc,
 	    Tcl_Obj *CONST objv[])
 }
 declare 88 generic {
@@ -331,20 +330,20 @@ declare 88 generic {
 	    CONST char *chanName, ClientData instanceData, int mask)
 }
 declare 89 generic {
-    void Tcl_CreateChannelHandler(Tcl_Channel chan, int mask, \
+    void Tcl_CreateChannelHandler(Tcl_Channel chan, int mask,
 	    Tcl_ChannelProc *proc, ClientData clientData)
 }
 declare 90 generic {
-    void Tcl_CreateCloseHandler(Tcl_Channel chan, Tcl_CloseProc *proc, \
+    void Tcl_CreateCloseHandler(Tcl_Channel chan, Tcl_CloseProc *proc,
 	    ClientData clientData)
 }
 declare 91 generic {
-    Tcl_Command Tcl_CreateCommand(Tcl_Interp *interp, CONST char *cmdName, \
-	    Tcl_CmdProc *proc, ClientData clientData, \
+    Tcl_Command Tcl_CreateCommand(Tcl_Interp *interp, CONST char *cmdName,
+	    Tcl_CmdProc *proc, ClientData clientData,
 	    Tcl_CmdDeleteProc *deleteProc)
 }
 declare 92 generic {
-    void Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc, \
+    void Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc,
 	    Tcl_EventCheckProc *checkProc, ClientData clientData)
 }
 declare 93 generic {
@@ -354,37 +353,37 @@ declare 94 generic {
     Tcl_Interp * Tcl_CreateInterp(void)
 }
 declare 95 generic {
-    void Tcl_CreateMathFunc(Tcl_Interp *interp, CONST char *name, \
-                            int numArgs, Tcl_ValueType *argTypes, 
-                            Tcl_MathProc *proc, ClientData clientData)
+    void Tcl_CreateMathFunc(Tcl_Interp *interp, CONST char *name,
+	    int numArgs, Tcl_ValueType *argTypes, 
+	    Tcl_MathProc *proc, ClientData clientData)
 }
 declare 96 generic {
-    Tcl_Command Tcl_CreateObjCommand(Tcl_Interp *interp, \
-	    CONST char *cmdName, \
-	    Tcl_ObjCmdProc *proc, ClientData clientData, \
+    Tcl_Command Tcl_CreateObjCommand(Tcl_Interp *interp,
+	    CONST char *cmdName,
+	    Tcl_ObjCmdProc *proc, ClientData clientData,
 	    Tcl_CmdDeleteProc *deleteProc)
 }
 declare 97 generic {
-    Tcl_Interp * Tcl_CreateSlave(Tcl_Interp *interp, CONST char *slaveName, \
+    Tcl_Interp * Tcl_CreateSlave(Tcl_Interp *interp, CONST char *slaveName,
 	    int isSafe)
 }
 declare 98 generic {
-    Tcl_TimerToken Tcl_CreateTimerHandler(int milliseconds, \
+    Tcl_TimerToken Tcl_CreateTimerHandler(int milliseconds,
 	    Tcl_TimerProc *proc, ClientData clientData)
 }
 declare 99 generic {
-    Tcl_Trace Tcl_CreateTrace(Tcl_Interp *interp, int level, \
+    Tcl_Trace Tcl_CreateTrace(Tcl_Interp *interp, int level,
 	    Tcl_CmdTraceProc *proc, ClientData clientData)
 }
 declare 100 generic {
     void Tcl_DeleteAssocData(Tcl_Interp *interp, CONST char *name)
 }
 declare 101 generic {
-    void Tcl_DeleteChannelHandler(Tcl_Channel chan, Tcl_ChannelProc *proc, \
+    void Tcl_DeleteChannelHandler(Tcl_Channel chan, Tcl_ChannelProc *proc,
 	    ClientData clientData)
 }
 declare 102 generic {
-    void Tcl_DeleteCloseHandler(Tcl_Channel chan, Tcl_CloseProc *proc, \
+    void Tcl_DeleteCloseHandler(Tcl_Channel chan, Tcl_CloseProc *proc,
 	    ClientData clientData)
 }
 declare 103 generic {
@@ -397,7 +396,7 @@ declare 105 generic {
     void Tcl_DeleteEvents(Tcl_EventDeleteProc *proc, ClientData clientData)
 }
 declare 106 generic {
-    void Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc, \
+    void Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc,
 	    Tcl_EventCheckProc *checkProc, ClientData clientData)
 }
 declare 107 generic {
@@ -422,7 +421,7 @@ declare 113 generic {
     void Tcl_DeleteTrace(Tcl_Interp *interp, Tcl_Trace trace)
 }
 declare 114 generic {
-    void Tcl_DontCallWhenDeleted(Tcl_Interp *interp, \
+    void Tcl_DontCallWhenDeleted(Tcl_Interp *interp,
 	    Tcl_InterpDeleteProc *proc, ClientData clientData)
 }
 declare 115 generic {
@@ -432,12 +431,10 @@ declare 116 generic {
     void Tcl_DoWhenIdle(Tcl_IdleProc *proc, ClientData clientData)
 }
 declare 117 generic {
-    char * Tcl_DStringAppend(Tcl_DString *dsPtr, CONST char *str, \
-	    int length)
+    char * Tcl_DStringAppend(Tcl_DString *dsPtr, CONST char *str, int length)
 }
 declare 118 generic {
-    char * Tcl_DStringAppendElement(Tcl_DString *dsPtr, \
-	    CONST char *string)
+    char * Tcl_DStringAppendElement(Tcl_DString *dsPtr, CONST char *string)
 }
 declare 119 generic {
     void Tcl_DStringEndSublist(Tcl_DString *dsPtr)
@@ -486,7 +483,7 @@ declare 133 generic {
     void Tcl_Exit(int status)
 }
 declare 134 generic {
-    int Tcl_ExposeCommand(Tcl_Interp *interp, CONST char *hiddenCmdToken, \
+    int Tcl_ExposeCommand(Tcl_Interp *interp, CONST char *hiddenCmdToken,
 	    CONST char *cmdName)
 }
 declare 135 generic {
@@ -508,7 +505,7 @@ declare 140 generic {
     int Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr, long *ptr)
 }
 declare 141 generic {
-    int Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
+    int Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    Tcl_Obj **resultPtrPtr)
 }
 declare 142 generic {
@@ -521,7 +518,7 @@ declare 144 generic {
     void Tcl_FindExecutable(CONST char *argv0)
 }
 declare 145 generic {
-    Tcl_HashEntry * Tcl_FirstHashEntry(Tcl_HashTable *tablePtr, \
+    Tcl_HashEntry * Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
 	    Tcl_HashSearch *searchPtr)
 }
 declare 146 generic {
@@ -531,28 +528,28 @@ declare 147 generic {
     void Tcl_FreeResult(Tcl_Interp *interp)
 }
 declare 148 generic {
-    int Tcl_GetAlias(Tcl_Interp *interp, CONST char *slaveCmd, \
-	    Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr, \
+    int Tcl_GetAlias(Tcl_Interp *interp, CONST char *slaveCmd,
+	    Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr,
 	    int *argcPtr, char ***argvPtr)
 }
 declare 149 generic {
-    int Tcl_GetAliasObj(Tcl_Interp *interp, CONST char *slaveCmd, \
-	    Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr, \
+    int Tcl_GetAliasObj(Tcl_Interp *interp, CONST char *slaveCmd,
+	    Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr,
 	    int *objcPtr, Tcl_Obj ***objv)
 }
 declare 150 generic {
-    ClientData Tcl_GetAssocData(Tcl_Interp *interp, CONST char *name, \
+    ClientData Tcl_GetAssocData(Tcl_Interp *interp, CONST char *name,
 	    Tcl_InterpDeleteProc **procPtr)
 }
 declare 151 generic {
-    Tcl_Channel Tcl_GetChannel(Tcl_Interp *interp, CONST char *chanName, \
+    Tcl_Channel Tcl_GetChannel(Tcl_Interp *interp, CONST char *chanName,
 	    int *modePtr)
 }
 declare 152 generic {
     int Tcl_GetChannelBufferSize(Tcl_Channel chan)
 }
 declare 153 generic {
-    int Tcl_GetChannelHandle(Tcl_Channel chan, int direction, \
+    int Tcl_GetChannelHandle(Tcl_Channel chan, int direction,
 	    ClientData *handlePtr)
 }
 declare 154 generic {
@@ -565,14 +562,14 @@ declare 156 generic {
     CONST char * Tcl_GetChannelName(Tcl_Channel chan)
 }
 declare 157 generic {
-    int Tcl_GetChannelOption(Tcl_Interp *interp, Tcl_Channel chan, \
+    int Tcl_GetChannelOption(Tcl_Interp *interp, Tcl_Channel chan,
 	    CONST char *optionName, Tcl_DString *dsPtr)
 }
 declare 158 generic {
     Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan)
 }
 declare 159 generic {
-    int Tcl_GetCommandInfo(Tcl_Interp *interp, CONST char *cmdName, \
+    int Tcl_GetCommandInfo(Tcl_Interp *interp, CONST char *cmdName,
 	    Tcl_CmdInfo *infoPtr)
 }
 declare 160 generic {
@@ -601,7 +598,7 @@ declare 166 generic {
 # generic interface, so we inlcude it here for compatibility reasons.
 
 declare 167 unix {
-    int Tcl_GetOpenFile(Tcl_Interp *interp, CONST char *str, int forWriting, \
+    int Tcl_GetOpenFile(Tcl_Interp *interp, CONST char *str, int forWriting,
 	    int checkUsage, ClientData *filePtr)
 }
 # Obsolete.  Should now use Tcl_FSGetPathType which is objectified
@@ -631,7 +628,7 @@ declare 175 generic {
     CONST char * Tcl_GetVar(Tcl_Interp *interp, char *varName, int flags)
 }
 declare 176 generic {
-    CONST char * Tcl_GetVar2(Tcl_Interp *interp, char *part1, char *part2, \
+    CONST char * Tcl_GetVar2(Tcl_Interp *interp, char *part1, char *part2,
 	    int flags)
 }
 declare 177 generic {
@@ -641,7 +638,7 @@ declare 178 generic {
     int Tcl_GlobalEvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
 }
 declare 179 generic {
-    int Tcl_HideCommand(Tcl_Interp *interp, CONST char *cmdName, \
+    int Tcl_HideCommand(Tcl_Interp *interp, CONST char *cmdName,
 	    CONST char *hiddenCmdToken)
 }
 declare 180 generic {
@@ -695,29 +692,29 @@ declare 194 generic {
     void Tcl_NotifyChannel(Tcl_Channel channel, int mask)
 }
 declare 195 generic {
-    Tcl_Obj * Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, \
+    Tcl_Obj * Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 	    Tcl_Obj *part2Ptr, int flags)
 }
 declare 196 generic {
-    Tcl_Obj * Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, \
+    Tcl_Obj * Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 	    Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags)
 }
 declare 197 {unix win} {
-    Tcl_Channel Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc, \
+    Tcl_Channel Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc,
 	    CONST84 char **argv, int flags)
 }
 # This is obsolete, use Tcl_FSOpenFileChannel
 declare 198 generic {
-    Tcl_Channel Tcl_OpenFileChannel(Tcl_Interp *interp, CONST char *fileName, \
+    Tcl_Channel Tcl_OpenFileChannel(Tcl_Interp *interp, CONST char *fileName,
 	    CONST char *modeString, int permissions)
 }
 declare 199 generic {
-    Tcl_Channel Tcl_OpenTcpClient(Tcl_Interp *interp, int port, \
+    Tcl_Channel Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
 	    CONST char *address, CONST char *myaddr, int myport, int async)
 }
 declare 200 generic {
-    Tcl_Channel Tcl_OpenTcpServer(Tcl_Interp *interp, int port, \
-	    CONST char *host, Tcl_TcpAcceptProc *acceptProc, \
+    Tcl_Channel Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
+	    CONST char *host, Tcl_TcpAcceptProc *acceptProc,
 	    ClientData callbackData)
 }
 declare 201 generic {
@@ -757,15 +754,15 @@ declare 212 generic {
     Tcl_RegExp Tcl_RegExpCompile(Tcl_Interp *interp, CONST char *string)
 }
 declare 213 generic {
-    int Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp, \
+    int Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
 	    CONST char *str, CONST char *start)
 }
 declare 214 generic {
-    int Tcl_RegExpMatch(Tcl_Interp *interp, CONST char *str, \
+    int Tcl_RegExpMatch(Tcl_Interp *interp, CONST char *str,
 	    CONST char *pattern)
 }
 declare 215 generic {
-    void Tcl_RegExpRange(Tcl_RegExp regexp, int index, \
+    void Tcl_RegExpRange(Tcl_RegExp regexp, int index,
 	    CONST char **startPtr, CONST char **endPtr)
 }
 declare 216 generic {
@@ -780,8 +777,9 @@ declare 218 generic {
 declare 219 generic {
     int Tcl_ScanCountedElement(CONST char *str, int length, int *flagPtr)
 }
+# Obsolete
 declare 220 generic {
-    int Tcl_Seek(Tcl_Channel chan, int offset, int mode)
+    int Tcl_SeekOld(Tcl_Channel chan, int offset, int mode)
 }
 declare 221 generic {
     int Tcl_ServiceAll(void)
@@ -790,18 +788,18 @@ declare 222 generic {
     int Tcl_ServiceEvent(int flags)
 }
 declare 223 generic {
-    void Tcl_SetAssocData(Tcl_Interp *interp, CONST char *name, \
+    void Tcl_SetAssocData(Tcl_Interp *interp, CONST char *name,
 	    Tcl_InterpDeleteProc *proc, ClientData clientData)
 }
 declare 224 generic {
     void Tcl_SetChannelBufferSize(Tcl_Channel chan, int sz)
 }
 declare 225 generic {
-    int Tcl_SetChannelOption(Tcl_Interp *interp, Tcl_Channel chan, \
+    int Tcl_SetChannelOption(Tcl_Interp *interp, Tcl_Channel chan,
 	    CONST char *optionName, CONST char *newValue)
 }
 declare 226 generic {
-    int Tcl_SetCommandInfo(Tcl_Interp *interp, CONST char *cmdName, \
+    int Tcl_SetCommandInfo(Tcl_Interp *interp, CONST char *cmdName,
 	    CONST Tcl_CmdInfo *infoPtr)
 }
 declare 227 generic {
@@ -820,7 +818,7 @@ declare 231 generic {
     int Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth)
 }
 declare 232 generic {
-    void Tcl_SetResult(Tcl_Interp *interp, char *str, \
+    void Tcl_SetResult(Tcl_Interp *interp, char *str,
 	    Tcl_FreeProc *freeProc)
 }
 declare 233 generic {
@@ -836,11 +834,11 @@ declare 236 generic {
     void Tcl_SetStdChannel(Tcl_Channel channel, int type)
 }
 declare 237 generic {
-    CONST char * Tcl_SetVar(Tcl_Interp *interp, char *varName, \
+    CONST char * Tcl_SetVar(Tcl_Interp *interp, char *varName,
 	    CONST char *newValue, int flags)
 }
 declare 238 generic {
-    CONST char * Tcl_SetVar2(Tcl_Interp *interp, char *part1, char *part2, \
+    CONST char * Tcl_SetVar2(Tcl_Interp *interp, char *part1, char *part2,
 	    CONST char *newValue, int flags)
 }
 declare 239 generic {
@@ -853,7 +851,7 @@ declare 241 generic {
     void Tcl_SourceRCFile(Tcl_Interp *interp)
 }
 declare 242 generic {
-    int Tcl_SplitList(Tcl_Interp *interp, CONST char *listStr, int *argcPtr, \
+    int Tcl_SplitList(Tcl_Interp *interp, CONST char *listStr, int *argcPtr,
 	    CONST84 char ***argvPtr)
 }
 # Obsolete, use Tcl_FSSplitPath
@@ -861,25 +859,26 @@ declare 243 generic {
     void Tcl_SplitPath(CONST char *path, int *argcPtr, CONST84 char ***argvPtr)
 }
 declare 244 generic {
-    void Tcl_StaticPackage(Tcl_Interp *interp, CONST char *pkgName, \
+    void Tcl_StaticPackage(Tcl_Interp *interp, CONST char *pkgName,
 	    Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc)
 }
 declare 245 generic {
     int Tcl_StringMatch(CONST char *str, CONST char *pattern)
 }
+# Obsolete
 declare 246 generic {
-    int Tcl_Tell(Tcl_Channel chan)
+    int Tcl_TellOld(Tcl_Channel chan)
 }
 declare 247 generic {
-    int Tcl_TraceVar(Tcl_Interp *interp, char *varName, int flags, \
+    int Tcl_TraceVar(Tcl_Interp *interp, char *varName, int flags,
 	    Tcl_VarTraceProc *proc, ClientData clientData)
 }
 declare 248 generic {
-    int Tcl_TraceVar2(Tcl_Interp *interp, char *part1, char *part2, \
+    int Tcl_TraceVar2(Tcl_Interp *interp, char *part1, char *part2,
 	    int flags, Tcl_VarTraceProc *proc, ClientData clientData)
 }
 declare 249 generic {
-    char * Tcl_TranslateFileName(Tcl_Interp *interp, CONST char *name, \
+    char * Tcl_TranslateFileName(Tcl_Interp *interp, CONST char *name,
 	    Tcl_DString *bufferPtr)
 }
 declare 250 generic {
@@ -898,41 +897,41 @@ declare 254 generic {
     int Tcl_UnsetVar2(Tcl_Interp *interp, char *part1, char *part2, int flags)
 }
 declare 255 generic {
-    void Tcl_UntraceVar(Tcl_Interp *interp, char *varName, int flags, \
+    void Tcl_UntraceVar(Tcl_Interp *interp, char *varName, int flags,
 	    Tcl_VarTraceProc *proc, ClientData clientData)
 }
 declare 256 generic {
-    void Tcl_UntraceVar2(Tcl_Interp *interp, char *part1, char *part2, \
+    void Tcl_UntraceVar2(Tcl_Interp *interp, char *part1, char *part2,
 	    int flags, Tcl_VarTraceProc *proc, ClientData clientData)
 }
 declare 257 generic {
     void Tcl_UpdateLinkedVar(Tcl_Interp *interp, char *varName)
 }
 declare 258 generic {
-    int Tcl_UpVar(Tcl_Interp *interp, CONST char *frameName, char *varName, \
+    int Tcl_UpVar(Tcl_Interp *interp, CONST char *frameName, char *varName,
 	    CONST char *localName, int flags)
 }
 declare 259 generic {
-    int Tcl_UpVar2(Tcl_Interp *interp, CONST char *frameName, char *part1, \
+    int Tcl_UpVar2(Tcl_Interp *interp, CONST char *frameName, char *part1,
 	    char *part2, CONST char *localName, int flags)
 }
 declare 260 generic {
     int Tcl_VarEval(Tcl_Interp *interp, ...)
 }
 declare 261 generic {
-    ClientData Tcl_VarTraceInfo(Tcl_Interp *interp, char *varName, \
+    ClientData Tcl_VarTraceInfo(Tcl_Interp *interp, char *varName,
 	    int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData)
 }
 declare 262 generic {
-    ClientData Tcl_VarTraceInfo2(Tcl_Interp *interp, char *part1, \
-	    char *part2, int flags, Tcl_VarTraceProc *procPtr, \
+    ClientData Tcl_VarTraceInfo2(Tcl_Interp *interp, char *part1,
+	    char *part2, int flags, Tcl_VarTraceProc *procPtr,
 	    ClientData prevClientData)
 }
 declare 263 generic {
     int Tcl_Write(Tcl_Channel chan, CONST char *s, int slen)
 }
 declare 264 generic {
-    void Tcl_WrongNumArgs(Tcl_Interp *interp, int objc, \
+    void Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
 	    Tcl_Obj *CONST objv[], CONST char *message)
 }
 declare 265 generic {
@@ -956,20 +955,19 @@ declare 270 generic {
 }
 declare 271 generic {
     CONST char * Tcl_PkgPresent(Tcl_Interp *interp, CONST char *name,
-                                CONST char *version, int exact)
+	    CONST char *version, int exact)
 }
 declare 272 generic {
     CONST char * Tcl_PkgPresentEx(Tcl_Interp *interp, CONST char *name,
-                                  CONST char *version, int exact,
-                                  ClientData *clientDataPtr)
+	    CONST char *version, int exact, ClientData *clientDataPtr)
 }
 declare 273 generic {
     int Tcl_PkgProvide(Tcl_Interp *interp, CONST char *name, 
-                       CONST char *version)
+	    CONST char *version)
 }
 declare 274 generic {
     CONST char * Tcl_PkgRequire(Tcl_Interp *interp, CONST char *name, 
-                                CONST char *version, int exact)
+	    CONST char *version, int exact)
 }
 declare 275 generic {
     void Tcl_SetErrorCodeVA(Tcl_Interp *interp, va_list argList)
@@ -1005,9 +1003,8 @@ declare 280 generic {
 # version into the new one).
 
 declare 281 generic {
-    Tcl_Channel Tcl_StackChannel(Tcl_Interp *interp, \
-	    Tcl_ChannelType *typePtr, ClientData instanceData, \
-	    int mask, Tcl_Channel prevChan)
+    Tcl_Channel Tcl_StackChannel(Tcl_Interp *interp, Tcl_ChannelType *typePtr,
+	    ClientData instanceData, int mask, Tcl_Channel prevChan)
 }
 declare 282 generic {
     int Tcl_UnstackChannel(Tcl_Interp *interp, Tcl_Channel chan)
@@ -1047,7 +1044,7 @@ declare 291 generic {
     int Tcl_EvalEx(Tcl_Interp *interp, char *script, int numBytes, int flags)
 }
 declare 292 generic {
-    int Tcl_EvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], \
+    int Tcl_EvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
 	    int flags)
 }
 declare 293 generic {
@@ -1057,13 +1054,13 @@ declare 294 generic {
     void Tcl_ExitThread(int status)
 }
 declare 295 generic {
-    int Tcl_ExternalToUtf(Tcl_Interp *interp, Tcl_Encoding encoding, \
-	    CONST char *src, int srcLen, int flags, \
-	    Tcl_EncodingState *statePtr, char *dst, int dstLen, \
+    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)
 }
 declare 296 generic {
-    char * Tcl_ExternalToUtfDString(Tcl_Encoding encoding, \
+    char * Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
 	    CONST char *src, int srcLen, Tcl_DString *dsPtr)
 }
 declare 297 generic {
@@ -1088,15 +1085,15 @@ declare 303 generic {
     void Tcl_GetEncodingNames(Tcl_Interp *interp)
 }
 declare 304 generic {
-    int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, Tcl_Obj *objPtr, \
-	    CONST char **tablePtr, int offset, CONST char *msg, int flags, \
+    int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, Tcl_Obj *objPtr,
+	    CONST char **tablePtr, int offset, CONST char *msg, int flags,
 	    int *indexPtr)
 }
 declare 305 generic {
     VOID * Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, int size)
 }
 declare 306 generic {
-    Tcl_Obj * Tcl_GetVar2Ex(Tcl_Interp *interp, char *part1, char *part2, \
+    Tcl_Obj * Tcl_GetVar2Ex(Tcl_Interp *interp, char *part1, char *part2,
 	    int flags)
 }
 declare 307 generic {
@@ -1112,14 +1109,14 @@ declare 310 generic {
     void Tcl_ConditionNotify(Tcl_Condition *condPtr)
 }
 declare 311 generic {
-    void Tcl_ConditionWait(Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, \
+    void Tcl_ConditionWait(Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr,
 	    Tcl_Time *timePtr)
 }
 declare 312 generic {
     int Tcl_NumUtfChars(CONST char *src, int len)
 }
 declare 313 generic {
-    int Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead, \
+    int Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead,
 	    int appendFlag)
 }
 declare 314 generic {
@@ -1132,14 +1129,14 @@ declare 316 generic {
     int Tcl_SetSystemEncoding(Tcl_Interp *interp, CONST char *name)
 }
 declare 317 generic {
-    Tcl_Obj * Tcl_SetVar2Ex(Tcl_Interp *interp, char *part1, char *part2, \
+    Tcl_Obj * Tcl_SetVar2Ex(Tcl_Interp *interp, char *part1, char *part2,
 	    Tcl_Obj *newValuePtr, int flags)
 }
 declare 318 generic {
     void Tcl_ThreadAlert(Tcl_ThreadId threadId)
 }
 declare 319 generic {
-    void Tcl_ThreadQueueEvent(Tcl_ThreadId threadId, Tcl_Event* evPtr, \
+    void Tcl_ThreadQueueEvent(Tcl_ThreadId threadId, Tcl_Event* evPtr,
 	    Tcl_QueuePosition position)
 }
 declare 320 generic {
@@ -1179,13 +1176,13 @@ declare 331 generic {
     CONST char * Tcl_UtfPrev(CONST char *src, CONST char *start)
 }
 declare 332 generic {
-    int Tcl_UtfToExternal(Tcl_Interp *interp, Tcl_Encoding encoding, \
-	    CONST char *src, int srcLen, int flags, \
-	    Tcl_EncodingState *statePtr, char *dst, int dstLen, \
+    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)
 }
 declare 333 generic {
-    char * Tcl_UtfToExternalDString(Tcl_Encoding encoding, \
+    char * Tcl_UtfToExternalDString(Tcl_Encoding encoding,
 	    CONST char *src, int srcLen, Tcl_DString *dsPtr)
 }
 declare 334 generic {
@@ -1246,51 +1243,52 @@ declare 352 generic {
     int Tcl_UniCharLen(CONST Tcl_UniChar *str)
 }
 declare 353 generic {
-    int Tcl_UniCharNcmp(CONST Tcl_UniChar *cs, CONST Tcl_UniChar *ct,\
-    unsigned long n)
+    int Tcl_UniCharNcmp(CONST Tcl_UniChar *cs, CONST Tcl_UniChar *ct,
+	    unsigned long n)
 }
 declare 354 generic {
-    char * Tcl_UniCharToUtfDString(CONST Tcl_UniChar *string, \
+    char * Tcl_UniCharToUtfDString(CONST Tcl_UniChar *string,
 	    int numChars, Tcl_DString *dsPtr)
 }
 declare 355 generic {
-    Tcl_UniChar * Tcl_UtfToUniCharDString(CONST char *string, \
+    Tcl_UniChar * Tcl_UtfToUniCharDString(CONST char *string,
 	    int length, Tcl_DString *dsPtr)
 }
 declare 356 generic {
-    Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp, Tcl_Obj *patObj, int flags)
+    Tcl_RegExp Tcl_GetRegExpFromObj(Tcl_Interp *interp, Tcl_Obj *patObj,
+	    int flags)
 }
 
 declare 357 generic {
-    Tcl_Obj *Tcl_EvalTokens (Tcl_Interp *interp, Tcl_Token *tokenPtr, \
+    Tcl_Obj *Tcl_EvalTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
 	    int count)
 }
 declare 358 generic {
-    void Tcl_FreeParse (Tcl_Parse *parsePtr)
+    void Tcl_FreeParse(Tcl_Parse *parsePtr)
 }
 declare 359 generic {
-    void Tcl_LogCommandInfo (Tcl_Interp *interp, CONST char *script, \
+    void Tcl_LogCommandInfo(Tcl_Interp *interp, CONST char *script,
 	    CONST char *command, int length)
 }
 declare 360 generic {
-    int Tcl_ParseBraces (Tcl_Interp *interp, char *string, \
+    int Tcl_ParseBraces(Tcl_Interp *interp, char *string,
 	    int numBytes, Tcl_Parse *parsePtr, int append, char **termPtr)
 }
 declare 361 generic {
-    int Tcl_ParseCommand (Tcl_Interp *interp, char *string, int numBytes, \
+    int Tcl_ParseCommand(Tcl_Interp *interp, char *string, int numBytes,
 	    int nested, Tcl_Parse *parsePtr)
 }
 declare 362 generic {
-    int Tcl_ParseExpr(Tcl_Interp *interp, char *string, int numBytes, \
+    int Tcl_ParseExpr(Tcl_Interp *interp, char *string, int numBytes,
 	    Tcl_Parse *parsePtr)	 
 }
 declare 363 generic {
-    int Tcl_ParseQuotedString(Tcl_Interp *interp, char *string, int numBytes, \
+    int Tcl_ParseQuotedString(Tcl_Interp *interp, char *string, int numBytes,
 	    Tcl_Parse *parsePtr, int append, char **termPtr)
 }
 declare 364 generic {
-    int Tcl_ParseVarName (Tcl_Interp *interp, char *string, \
-	    int numBytes, Tcl_Parse *parsePtr, int append)
+    int Tcl_ParseVarName(Tcl_Interp *interp, char *string, int numBytes,
+	    Tcl_Parse *parsePtr, int append)
 }
 # These 4 functions are obsolete, use Tcl_FSGetCwd, Tcl_FSChdir,
 # Tcl_FSAccess and Tcl_FSStat
@@ -1328,7 +1326,7 @@ declare 375 generic {
     int Tcl_UniCharIsPunct(int ch)
 }
 declare 376 generic {
-    int Tcl_RegExpExecObj(Tcl_Interp *interp, Tcl_RegExp regexp, \
+    int Tcl_RegExpExecObj(Tcl_Interp *interp, Tcl_RegExp regexp,
 	    Tcl_Obj *objPtr, int offset, int nmatches, int flags)
 }
 declare 377 generic {
@@ -1339,26 +1337,26 @@ declare 378 generic {
 }
 declare 379 generic {
     void Tcl_SetUnicodeObj(Tcl_Obj *objPtr, CONST Tcl_UniChar *unicode,
-	                   int numChars)
+	    int numChars)
 }
 declare 380 generic {
-    int Tcl_GetCharLength (Tcl_Obj *objPtr)
+    int Tcl_GetCharLength(Tcl_Obj *objPtr)
 }
 declare 381 generic {
-    Tcl_UniChar Tcl_GetUniChar (Tcl_Obj *objPtr, int index)
+    Tcl_UniChar Tcl_GetUniChar(Tcl_Obj *objPtr, int index)
 }
 declare 382 generic {
-    Tcl_UniChar * Tcl_GetUnicode (Tcl_Obj *objPtr)
+    Tcl_UniChar * Tcl_GetUnicode(Tcl_Obj *objPtr)
 }
 declare 383 generic {
-    Tcl_Obj * Tcl_GetRange (Tcl_Obj *objPtr, int first, int last)
+    Tcl_Obj * Tcl_GetRange(Tcl_Obj *objPtr, int first, int last)
 }
 declare 384 generic {
-    void Tcl_AppendUnicodeToObj (Tcl_Obj *objPtr,
-	                         CONST Tcl_UniChar *unicode, int length)
+    void Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr, CONST Tcl_UniChar *unicode,
+	    int length)
 }
 declare 385 generic {
-    int Tcl_RegExpMatchObj(Tcl_Interp *interp, Tcl_Obj *stringObj, \
+    int Tcl_RegExpMatchObj(Tcl_Interp *interp, Tcl_Obj *stringObj,
 	    Tcl_Obj *patternObj)
 }
 declare 386 generic {
@@ -1374,32 +1372,32 @@ declare 389 generic {
     int Tcl_GetChannelNamesEx(Tcl_Interp *interp, CONST char *pattern)
 }
 declare 390 generic {
-    int Tcl_ProcObjCmd(ClientData clientData, Tcl_Interp *interp, \
+    int Tcl_ProcObjCmd(ClientData clientData, Tcl_Interp *interp,
 	    int objc, Tcl_Obj *CONST objv[])
 }
 declare 391 generic {
-    void Tcl_ConditionFinalize (Tcl_Condition *condPtr)
+    void Tcl_ConditionFinalize(Tcl_Condition *condPtr)
 }
 declare 392 generic {
-    void Tcl_MutexFinalize (Tcl_Mutex *mutex)
+    void Tcl_MutexFinalize(Tcl_Mutex *mutex)
 }
 declare 393 generic {
-    int Tcl_CreateThread (Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc proc, \
+    int Tcl_CreateThread(Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc proc,
 	    ClientData clientData, int stackSize, int flags)
 }
 
 # Introduced in 8.3.2
 declare 394 generic {
-    int Tcl_ReadRaw (Tcl_Channel chan, char *dst, int bytesToRead)
+    int Tcl_ReadRaw(Tcl_Channel chan, char *dst, int bytesToRead)
 }
 declare 395 generic {
-    int Tcl_WriteRaw (Tcl_Channel chan, CONST char *src, int srcLen)
+    int Tcl_WriteRaw(Tcl_Channel chan, CONST char *src, int srcLen)
 }
 declare 396 generic {
-    Tcl_Channel Tcl_GetTopChannel (Tcl_Channel chan)
+    Tcl_Channel Tcl_GetTopChannel(Tcl_Channel chan)
 }
 declare 397 generic {
-    int Tcl_ChannelBuffered (Tcl_Channel chan)
+    int Tcl_ChannelBuffered(Tcl_Channel chan)
 }
 declare 398 generic {
     CONST char * Tcl_ChannelName(Tcl_ChannelType *chanTypePtr)
@@ -1408,7 +1406,7 @@ declare 399 generic {
     Tcl_ChannelTypeVersion Tcl_ChannelVersion(Tcl_ChannelType *chanTypePtr)
 }
 declare 400 generic {
-    Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc(Tcl_ChannelType \
+    Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc(Tcl_ChannelType
 	    *chanTypePtr)
 }
 declare 401 generic {
@@ -1427,72 +1425,71 @@ declare 405 generic {
     Tcl_DriverSeekProc * Tcl_ChannelSeekProc(Tcl_ChannelType *chanTypePtr)
 }
 declare 406 generic {
-    Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc(Tcl_ChannelType \
+    Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc(Tcl_ChannelType
 	    *chanTypePtr)
 }
 declare 407 generic {
-    Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc(Tcl_ChannelType \
+    Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc(Tcl_ChannelType
 	    *chanTypePtr)
 }
 declare 408 generic {
     Tcl_DriverWatchProc * Tcl_ChannelWatchProc(Tcl_ChannelType *chanTypePtr)
 }
 declare 409 generic {
-    Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc(Tcl_ChannelType \
+    Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc(Tcl_ChannelType
 	    *chanTypePtr)
 }
 declare 410 generic {
     Tcl_DriverFlushProc * Tcl_ChannelFlushProc(Tcl_ChannelType *chanTypePtr)
 }
 declare 411 generic {
-    Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc(Tcl_ChannelType \
+    Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc(Tcl_ChannelType
 	    *chanTypePtr)
 }
 
 # Introduced in 8.4a2
 declare 412 generic {
-    int Tcl_JoinThread (Tcl_ThreadId id, int* result)
+    int Tcl_JoinThread(Tcl_ThreadId id, int* result)
 }
 declare 413 generic {
-    int Tcl_IsChannelShared (Tcl_Channel channel)
+    int Tcl_IsChannelShared(Tcl_Channel channel)
 }
 declare 414 generic {
-    int Tcl_IsChannelRegistered (Tcl_Interp* interp, Tcl_Channel channel)
+    int Tcl_IsChannelRegistered(Tcl_Interp* interp, Tcl_Channel channel)
 }
 declare 415 generic {
-    void Tcl_CutChannel (Tcl_Channel channel)
+    void Tcl_CutChannel(Tcl_Channel channel)
 }
 declare 416 generic {
-    void Tcl_SpliceChannel (Tcl_Channel channel)
+    void Tcl_SpliceChannel(Tcl_Channel channel)
 }
 declare 417 generic {
-    void Tcl_ClearChannelHandlers (Tcl_Channel channel)
+    void Tcl_ClearChannelHandlers(Tcl_Channel channel)
 }
 declare 418 generic {
-    int Tcl_IsChannelExisting (CONST char* channelName)
+    int Tcl_IsChannelExisting(CONST char* channelName)
 }
 
 declare 419 generic {
-    int Tcl_UniCharNcasecmp(CONST Tcl_UniChar *cs, CONST Tcl_UniChar *ct,\
+    int Tcl_UniCharNcasecmp(CONST Tcl_UniChar *cs, CONST Tcl_UniChar *ct,
 	    unsigned long n)
 }
 declare 420 generic {
-    int Tcl_UniCharCaseMatch(CONST Tcl_UniChar *ustr, \
+    int Tcl_UniCharCaseMatch(CONST Tcl_UniChar *ustr,
 	    CONST Tcl_UniChar *pattern, int nocase)
 }
 
 declare 421 generic {
-    Tcl_HashEntry *Tcl_FindHashEntry(Tcl_HashTable *tablePtr, \
-	    CONST char *key)
+    Tcl_HashEntry *Tcl_FindHashEntry(Tcl_HashTable *tablePtr, CONST char *key)
 }
 
 declare 422 generic {
-    Tcl_HashEntry *Tcl_CreateHashEntry(Tcl_HashTable *tablePtr, \
+    Tcl_HashEntry *Tcl_CreateHashEntry(Tcl_HashTable *tablePtr,
 	    CONST char *key, int *newPtr)
 }
 
 declare 423 generic {
-    void Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr, int keyType, \
+    void Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr, int keyType,
 	    Tcl_HashKeyType *typePtr)
 }
 
@@ -1500,15 +1497,16 @@ declare 424 generic {
     void Tcl_InitObjHashTable(Tcl_HashTable *tablePtr)
 }
 declare 425 generic {
-    ClientData Tcl_CommandTraceInfo(Tcl_Interp *interp, CONST char *varName, \
-	    int flags, Tcl_CommandTraceProc *procPtr, ClientData prevClientData)
+    ClientData Tcl_CommandTraceInfo(Tcl_Interp *interp, CONST char *varName,
+	    int flags, Tcl_CommandTraceProc *procPtr,
+	    ClientData prevClientData)
 }
 declare 426 generic {
-    int Tcl_TraceCommand(Tcl_Interp *interp, CONST char *varName, int flags, \
+    int Tcl_TraceCommand(Tcl_Interp *interp, CONST char *varName, int flags,
 	    Tcl_CommandTraceProc *proc, ClientData clientData)
 }
 declare 427 generic {
-    void Tcl_UntraceCommand(Tcl_Interp *interp, CONST char *varName, \
+    void Tcl_UntraceCommand(Tcl_Interp *interp, CONST char *varName,
 	    int flags, Tcl_CommandTraceProc *proc, ClientData clientData)
 }
 declare 428 generic {
@@ -1532,12 +1530,12 @@ declare 433 generic {
 }
 # introduced in 8.4a3
 declare 434 generic {
-    Tcl_UniChar * Tcl_GetUnicodeFromObj (Tcl_Obj *objPtr, int *lengthPtr)
+    Tcl_UniChar * Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr, int *lengthPtr)
 }
 declare 435 generic {
-    int Tcl_GetMathFuncInfo(Tcl_Interp *interp, CONST char *name, \
-	int *numArgsPtr, Tcl_ValueType **argTypesPtr, \
-	Tcl_MathProc **procPtr, ClientData *clientDataPtr)
+    int Tcl_GetMathFuncInfo(Tcl_Interp *interp, CONST char *name,
+	    int *numArgsPtr, Tcl_ValueType **argTypesPtr,
+	    Tcl_MathProc **procPtr, ClientData *clientDataPtr)
 }
 declare 436 generic {
     Tcl_Obj * Tcl_ListMathFuncs(Tcl_Interp *interp, CONST char *pattern)
@@ -1556,8 +1554,8 @@ declare 440 generic {
     int	Tcl_FSCopyFile(Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr)
 }
 declare 441 generic {
-    int	Tcl_FSCopyDirectory(Tcl_Obj *srcPathPtr, \
-			    Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr)
+    int	Tcl_FSCopyDirectory(Tcl_Obj *srcPathPtr,
+	    Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr)
 }
 declare 442 generic {
     int	Tcl_FSCreateDirectory(Tcl_Obj *pathPtr)
@@ -1566,55 +1564,52 @@ declare 443 generic {
     int	Tcl_FSDeleteFile(Tcl_Obj *pathPtr)
 }
 declare 444 generic {
-    int	Tcl_FSLoadFile(Tcl_Interp * interp, \
-		    Tcl_Obj *pathPtr, CONST char * sym1, CONST char * sym2, \
-		    Tcl_PackageInitProc ** proc1Ptr, \
-		    Tcl_PackageInitProc ** proc2Ptr, \
-		    ClientData * clientDataPtr, \
-		    Tcl_FSUnloadFileProc **unloadProcPtr)
+    int	Tcl_FSLoadFile(Tcl_Interp * interp,
+	    Tcl_Obj *pathPtr, CONST char * sym1, CONST char * sym2,
+	    Tcl_PackageInitProc ** proc1Ptr,
+	    Tcl_PackageInitProc ** proc2Ptr,
+	    ClientData * clientDataPtr,
+	    Tcl_FSUnloadFileProc **unloadProcPtr)
 }
 declare 445 generic {
-    int	Tcl_FSMatchInDirectory(Tcl_Interp *interp, Tcl_Obj * result, \
-		    Tcl_Obj *pathPtr, \
-		    CONST char * pattern, Tcl_GlobTypeData * types)
+    int	Tcl_FSMatchInDirectory(Tcl_Interp *interp, Tcl_Obj *result,
+	    Tcl_Obj *pathPtr, CONST char *pattern, Tcl_GlobTypeData *types)
 }
 declare 446 generic {
-    Tcl_Obj*	Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr)
+    Tcl_Obj * Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr)
 }
 declare 447 generic {
-    int	Tcl_FSRemoveDirectory(Tcl_Obj *pathPtr, \
-		    int recursive, Tcl_Obj **errorPtr)
+    int Tcl_FSRemoveDirectory(Tcl_Obj *pathPtr,
+	    int recursive, Tcl_Obj **errorPtr)
 }
 declare 448 generic {
     int	Tcl_FSRenameFile(Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr)
 }
 declare 449 generic {
-    int	Tcl_FSLstat(Tcl_Obj *pathPtr, struct stat *buf)
+    int	Tcl_FSLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf)
 }
 declare 450 generic {
     int Tcl_FSUtime(Tcl_Obj *pathPtr, struct utimbuf *tval)
 }
 declare 451 generic {
-    int Tcl_FSFileAttrsGet(Tcl_Interp *interp, \
-			    int index, Tcl_Obj *pathPtr, \
-			    Tcl_Obj **objPtrRef)
+    int Tcl_FSFileAttrsGet(Tcl_Interp *interp,
+	    int index, Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef)
 }
 declare 452 generic {
-    int Tcl_FSFileAttrsSet(Tcl_Interp *interp, \
-			    int index, Tcl_Obj *pathPtr, \
-			    Tcl_Obj *objPtr)
+    int Tcl_FSFileAttrsSet(Tcl_Interp *interp,
+	    int index, Tcl_Obj *pathPtr, Tcl_Obj *objPtr)
 }
 declare 453 generic {
     CONST char ** Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef)
 }
 declare 454 generic {
-    int Tcl_FSStat(Tcl_Obj *pathPtr, struct stat *buf)
+    int Tcl_FSStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf)
 }
 declare 455 generic {
     int Tcl_FSAccess(Tcl_Obj *pathPtr, int mode)
 }
 declare 456 generic {
-    Tcl_Channel Tcl_FSOpenFileChannel(Tcl_Interp *interp, Tcl_Obj *pathPtr, \
+    Tcl_Channel Tcl_FSOpenFileChannel(Tcl_Interp *interp, Tcl_Obj *pathPtr,
 	    CONST char *modeString, int permissions)
 }
 declare 457 generic {
@@ -1639,10 +1634,12 @@ declare 463 generic {
     Tcl_Obj* Tcl_FSGetNormalizedPath(Tcl_Interp *interp, Tcl_Obj* pathObjPtr)
 }
 declare 464 generic {
-    Tcl_Obj* Tcl_FSJoinToPath(Tcl_Obj *basePtr, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Obj* Tcl_FSJoinToPath(Tcl_Obj *basePtr, int objc,
+	    Tcl_Obj *CONST objv[])
 }
 declare 465 generic {
-    ClientData Tcl_FSGetInternalRep(Tcl_Obj* pathObjPtr, Tcl_Filesystem *fsPtr)
+    ClientData Tcl_FSGetInternalRep(Tcl_Obj* pathObjPtr,
+	    Tcl_Filesystem *fsPtr)
 }
 declare 466 generic {
     Tcl_Obj* Tcl_FSGetTranslatedPath(Tcl_Interp *interp, Tcl_Obj* pathPtr)
@@ -1651,7 +1648,8 @@ declare 467 generic {
     int Tcl_FSEvalFile(Tcl_Interp *interp, Tcl_Obj *fileName)
 }
 declare 468 generic {
-    Tcl_Obj* Tcl_FSNewNativePath(Tcl_Obj* fromFilesystem, ClientData clientData)
+    Tcl_Obj* Tcl_FSNewNativePath(Tcl_Obj* fromFilesystem,
+	    ClientData clientData)
 }
 declare 469 generic {
     CONST char* Tcl_FSGetNativePath(Tcl_Obj* pathObjPtr)
@@ -1675,14 +1673,14 @@ declare 475 generic {
     ClientData Tcl_FSData(Tcl_Filesystem *fsPtr)
 }
 declare 476 generic {
-    CONST char* Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp, \
+    CONST char* Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp,
 	    Tcl_Obj* pathPtr)
 }
 declare 477 generic {
     Tcl_Filesystem* Tcl_FSGetFileSystemForPath(Tcl_Obj* pathObjPtr)
 }
 declare 478 generic {
-    Tcl_PathType Tcl_FSGetPathType (Tcl_Obj *pathObjPtr)
+    Tcl_PathType Tcl_FSGetPathType(Tcl_Obj *pathObjPtr)
 }
 # New function due to TIP#49
 declare 479 generic {
@@ -1693,7 +1691,8 @@ declare 480 generic {
 }	  
 # New function due to TIP#56
 declare 481 generic {
-    int Tcl_EvalTokensStandard(Tcl_Interp *interp, Tcl_Token *tokenPtr, int count)
+    int Tcl_EvalTokensStandard(Tcl_Interp *interp, Tcl_Token *tokenPtr,
+	    int count)
 }
 
 # New export due to TIP#73 
@@ -1720,6 +1719,31 @@ declare 485 generic {
 	                             CONST Tcl_CmdInfo* infoPtr )
 }
 
+### New functions on 64-bit dev branch ###
+declare 486 generic {
+    Tcl_Obj * Tcl_DbNewWideIntObj(Tcl_WideInt wideValue,
+	    CONST char *file, int line)
+}
+declare 487 generic {
+    int Tcl_GetWideIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+	    Tcl_WideInt *widePtr)
+}
+declare 488 generic {
+    Tcl_Obj * Tcl_NewWideIntObj(Tcl_WideInt wideValue)
+}
+declare 489 generic {
+    void Tcl_SetWideIntObj(Tcl_Obj *objPtr, Tcl_WideInt wideValue)
+}
+declare 490 generic {
+    Tcl_StatBuf * Tcl_AllocStatBuf(void)
+}
+declare 491 generic {
+    Tcl_WideInt Tcl_Seek(Tcl_Channel chan, Tcl_WideInt offset, int mode)
+}
+declare 492 generic {
+    Tcl_WideInt Tcl_Tell(Tcl_Channel chan)
+}
+
 ##############################################################################
 
 # Define the platform specific public Tcl interface.  These functions are
@@ -1733,12 +1757,10 @@ interface tclPlat
 # Added in Tcl 8.1
 
 declare 0 win {
-    TCHAR * Tcl_WinUtfToTChar(CONST char *str, int len, \
-	    Tcl_DString *dsPtr)
+    TCHAR * Tcl_WinUtfToTChar(CONST char *str, int len, Tcl_DString *dsPtr)
 }
 declare 1 win {
-    char * Tcl_WinTCharToUtf(CONST TCHAR *str, int len, \
-	    Tcl_DString *dsPtr)
+    char * Tcl_WinTCharToUtf(CONST TCHAR *str, int len, Tcl_DString *dsPtr)
 }
 
 ##################
@@ -1757,12 +1779,12 @@ declare 1 mac {
     char * Tcl_MacConvertTextResource(Handle resource)
 }
 declare 2 mac {
-    int Tcl_MacEvalResource(Tcl_Interp *interp, CONST char *resourceName, \
+    int Tcl_MacEvalResource(Tcl_Interp *interp, CONST char *resourceName,
 	    int resourceNumber, CONST char *fileName)
 }
 declare 3 mac {
-    Handle Tcl_MacFindResource(Tcl_Interp *interp, long resourceType, \
-	    CONST char *resourceName, int resourceNumber, \
+    Handle Tcl_MacFindResource(Tcl_Interp *interp, long resourceType,
+	    CONST char *resourceName, int resourceNumber,
 	    CONST char *resFileRef, int * releaseIt)
 }
 
@@ -1770,7 +1792,7 @@ declare 3 mac {
 # character type and creator codes).
 
 declare 4 mac {
-    int Tcl_GetOSTypeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
+    int Tcl_GetOSTypeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    OSType *osTypePtr)
 }
 declare 5 mac {