* tools/genStubs.tcl: Updated script to no longer produce the

        _ANSI_ARGS_ wrapper in generated declarations.  Also revised to
        accept variadic prototypes with more than one fixed argument.
        (This is possible since TCL_VARARGS and its limitations are no
        longer in use).
        * generic/tcl.h:        Some reordering so that macro definitions
        do not interfere with the now _ANSI_ARGS_-less stub declarations.

        * generic/tclDecls.h:           make genstubs
        * generic/tclIntDecls.h:
        * generic/tclIntPlatDecls.h:
        * generic/tclPlatDecls.h:
        * generic/tclTomMathDecls.h:

1 files changed, 110 insertions, 125 deletions

diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 248a7e6..a87dad8 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.29 2006/03/21 11:06:22 das Exp $
+ * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.30 2006/11/15 14:58:27 dgp Exp $
  */
 
 #ifndef _TCLINTPLATDECLS
@@ -42,266 +42,251 @@
 #ifndef TclGetAndDetachPids_TCL_DECLARED
 #define TclGetAndDetachPids_TCL_DECLARED
 /* 0 */
-EXTERN void		TclGetAndDetachPids _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Channel chan));
+EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp, 
+				Tcl_Channel chan);
 #endif
 #ifndef TclpCloseFile_TCL_DECLARED
 #define TclpCloseFile_TCL_DECLARED
 /* 1 */
-EXTERN int		TclpCloseFile _ANSI_ARGS_((TclFile file));
+EXTERN int		TclpCloseFile (TclFile file);
 #endif
 #ifndef TclpCreateCommandChannel_TCL_DECLARED
 #define TclpCreateCommandChannel_TCL_DECLARED
 /* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel _ANSI_ARGS_((
-				TclFile readFile, TclFile writeFile, 
-				TclFile errorFile, int numPids, 
-				Tcl_Pid * pidPtr));
+EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile, 
+				TclFile writeFile, TclFile errorFile, 
+				int numPids, Tcl_Pid * pidPtr);
 #endif
 #ifndef TclpCreatePipe_TCL_DECLARED
 #define TclpCreatePipe_TCL_DECLARED
 /* 3 */
-EXTERN int		TclpCreatePipe _ANSI_ARGS_((TclFile * readPipe, 
-				TclFile * writePipe));
+EXTERN int		TclpCreatePipe (TclFile * readPipe, 
+				TclFile * writePipe);
 #endif
 #ifndef TclpCreateProcess_TCL_DECLARED
 #define TclpCreateProcess_TCL_DECLARED
 /* 4 */
-EXTERN int		TclpCreateProcess _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, CONST char ** argv, 
-				TclFile inputFile, TclFile outputFile, 
-				TclFile errorFile, Tcl_Pid * pidPtr));
+EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc, 
+				CONST char ** argv, TclFile inputFile, 
+				TclFile outputFile, TclFile errorFile, 
+				Tcl_Pid * pidPtr);
 #endif
 /* Slot 5 is reserved */
 #ifndef TclpMakeFile_TCL_DECLARED
 #define TclpMakeFile_TCL_DECLARED
 /* 6 */
-EXTERN TclFile		TclpMakeFile _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((
-				CONST char * contents));
+EXTERN TclFile		TclpCreateTempFile (CONST char * contents);
 #endif
 #ifndef TclpReaddir_TCL_DECLARED
 #define TclpReaddir_TCL_DECLARED
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((struct in_addr addr));
+EXTERN char *		TclpInetNtoa (struct in_addr addr);
 #endif
 #ifndef TclUnixCopyFile_TCL_DECLARED
 #define TclUnixCopyFile_TCL_DECLARED
 /* 14 */
-EXTERN int		TclUnixCopyFile _ANSI_ARGS_((CONST char * src, 
-				CONST char * dst, 
+EXTERN int		TclUnixCopyFile (CONST char * src, CONST char * dst, 
 				CONST Tcl_StatBuf * statBufPtr, 
-				int dontCopyAtts));
+				int dontCopyAtts);
 #endif
 #endif /* UNIX */
 #ifdef __WIN32__
 #ifndef TclWinConvertError_TCL_DECLARED
 #define TclWinConvertError_TCL_DECLARED
 /* 0 */
-EXTERN void		TclWinConvertError _ANSI_ARGS_((DWORD errCode));
+EXTERN void		TclWinConvertError (DWORD errCode);
 #endif
 #ifndef TclWinConvertWSAError_TCL_DECLARED
 #define TclWinConvertWSAError_TCL_DECLARED
 /* 1 */
-EXTERN void		TclWinConvertWSAError _ANSI_ARGS_((DWORD errCode));
+EXTERN void		TclWinConvertWSAError (DWORD errCode);
 #endif
 #ifndef TclWinGetServByName_TCL_DECLARED
 #define TclWinGetServByName_TCL_DECLARED
 /* 2 */
-EXTERN struct servent *	 TclWinGetServByName _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((void));
+EXTERN HINSTANCE	TclWinGetTclInstance (void);
 #endif
 /* Slot 5 is reserved */
 #ifndef TclWinNToHS_TCL_DECLARED
 #define TclWinNToHS_TCL_DECLARED
 /* 6 */
-EXTERN u_short		TclWinNToHS _ANSI_ARGS_((u_short ns));
+EXTERN u_short		TclWinNToHS (u_short ns);
 #endif
 #ifndef TclWinSetSockOpt_TCL_DECLARED
 #define TclWinSetSockOpt_TCL_DECLARED
 /* 7 */
-EXTERN int		TclWinSetSockOpt _ANSI_ARGS_((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 _ANSI_ARGS_((Tcl_Pid pid));
+EXTERN unsigned long	TclpGetPid (Tcl_Pid pid);
 #endif
 #ifndef TclWinGetPlatformId_TCL_DECLARED
 #define TclWinGetPlatformId_TCL_DECLARED
 /* 9 */
-EXTERN int		TclWinGetPlatformId _ANSI_ARGS_((void));
+EXTERN int		TclWinGetPlatformId (void);
 #endif
 /* Slot 10 is reserved */
 #ifndef TclGetAndDetachPids_TCL_DECLARED
 #define TclGetAndDetachPids_TCL_DECLARED
 /* 11 */
-EXTERN void		TclGetAndDetachPids _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Channel chan));
+EXTERN void		TclGetAndDetachPids (Tcl_Interp * interp, 
+				Tcl_Channel chan);
 #endif
 #ifndef TclpCloseFile_TCL_DECLARED
 #define TclpCloseFile_TCL_DECLARED
 /* 12 */
-EXTERN int		TclpCloseFile _ANSI_ARGS_((TclFile file));
+EXTERN int		TclpCloseFile (TclFile file);
 #endif
 #ifndef TclpCreateCommandChannel_TCL_DECLARED
 #define TclpCreateCommandChannel_TCL_DECLARED
 /* 13 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel _ANSI_ARGS_((
-				TclFile readFile, TclFile writeFile, 
-				TclFile errorFile, int numPids, 
-				Tcl_Pid * pidPtr));
+EXTERN Tcl_Channel	TclpCreateCommandChannel (TclFile readFile, 
+				TclFile writeFile, TclFile errorFile, 
+				int numPids, Tcl_Pid * pidPtr);
 #endif
 #ifndef TclpCreatePipe_TCL_DECLARED
 #define TclpCreatePipe_TCL_DECLARED
 /* 14 */
-EXTERN int		TclpCreatePipe _ANSI_ARGS_((TclFile * readPipe, 
-				TclFile * writePipe));
+EXTERN int		TclpCreatePipe (TclFile * readPipe, 
+				TclFile * writePipe);
 #endif
 #ifndef TclpCreateProcess_TCL_DECLARED
 #define TclpCreateProcess_TCL_DECLARED
 /* 15 */
-EXTERN int		TclpCreateProcess _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, CONST char ** argv, 
-				TclFile inputFile, TclFile outputFile, 
-				TclFile errorFile, Tcl_Pid * pidPtr));
+EXTERN int		TclpCreateProcess (Tcl_Interp * interp, int argc, 
+				CONST char ** argv, TclFile inputFile, 
+				TclFile outputFile, TclFile errorFile, 
+				Tcl_Pid * pidPtr);
 #endif
 /* Slot 16 is reserved */
 /* Slot 17 is reserved */
 #ifndef TclpMakeFile_TCL_DECLARED
 #define TclpMakeFile_TCL_DECLARED
 /* 18 */
-EXTERN TclFile		TclpMakeFile _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((HANDLE hProcess, 
-				DWORD id));
+EXTERN void		TclWinAddProcess (HANDLE hProcess, DWORD id);
 #endif
 /* Slot 21 is reserved */
 #ifndef TclpCreateTempFile_TCL_DECLARED
 #define TclpCreateTempFile_TCL_DECLARED
 /* 22 */
-EXTERN TclFile		TclpCreateTempFile _ANSI_ARGS_((
-				CONST char * contents));
+EXTERN TclFile		TclpCreateTempFile (CONST char * contents);
 #endif
 #ifndef TclpGetTZName_TCL_DECLARED
 #define TclpGetTZName_TCL_DECLARED
 /* 23 */
-EXTERN char *		TclpGetTZName _ANSI_ARGS_((int isdst));
+EXTERN char *		TclpGetTZName (int isdst);
 #endif
 #ifndef TclWinNoBackslash_TCL_DECLARED
 #define TclWinNoBackslash_TCL_DECLARED
 /* 24 */
-EXTERN char *		TclWinNoBackslash _ANSI_ARGS_((char * path));
+EXTERN char *		TclWinNoBackslash (char * path);
 #endif
 /* Slot 25 is reserved */
 #ifndef TclWinSetInterfaces_TCL_DECLARED
 #define TclWinSetInterfaces_TCL_DECLARED
 /* 26 */
-EXTERN void		TclWinSetInterfaces _ANSI_ARGS_((int wide));
+EXTERN void		TclWinSetInterfaces (int wide);
 #endif
 #ifndef TclWinFlushDirtyChannels_TCL_DECLARED
 #define TclWinFlushDirtyChannels_TCL_DECLARED
 /* 27 */
-EXTERN void		TclWinFlushDirtyChannels _ANSI_ARGS_((void));
+EXTERN void		TclWinFlushDirtyChannels (void);
 #endif
 #ifndef TclWinResetInterfaces_TCL_DECLARED
 #define TclWinResetInterfaces_TCL_DECLARED
 /* 28 */
-EXTERN void		TclWinResetInterfaces _ANSI_ARGS_((void));
+EXTERN void		TclWinResetInterfaces (void);
 #endif
 #ifndef TclWinCPUID_TCL_DECLARED
 #define TclWinCPUID_TCL_DECLARED
 /* 29 */
-EXTERN int		TclWinCPUID _ANSI_ARGS_((unsigned int index, 
-				unsigned int * regs));
+EXTERN int		TclWinCPUID (unsigned int index, unsigned int * regs);
 #endif
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TCL
 #ifndef TclMacOSXGetFileAttribute_TCL_DECLARED
 #define TclMacOSXGetFileAttribute_TCL_DECLARED
 /* 15 */
-EXTERN int		TclMacOSXGetFileAttribute _ANSI_ARGS_((
-				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 _ANSI_ARGS_((
-				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 _ANSI_ARGS_((
-				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 _ANSI_ARGS_((Tcl_Interp * interp, 
+EXTERN int		TclMacOSXMatchType (Tcl_Interp * interp, 
 				CONST char * pathName, CONST char * fileName, 
 				Tcl_StatBuf * statBufPtr, 
-				Tcl_GlobTypeData * types));
+				Tcl_GlobTypeData * types);
 #endif
 #endif /* MAC_OSX_TCL */
 
@@ -310,59 +295,59 @@ typedef struct TclIntPlatStubs {
     struct TclIntPlatStubHooks *hooks;
 
 #if !defined(__WIN32__) /* UNIX */
-    void (*tclGetAndDetachPids) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 0 */
-    int (*tclpCloseFile) _ANSI_ARGS_((TclFile file)); /* 1 */
-    Tcl_Channel (*tclpCreateCommandChannel) _ANSI_ARGS_((TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr)); /* 2 */
-    int (*tclpCreatePipe) _ANSI_ARGS_((TclFile * readPipe, TclFile * writePipe)); /* 3 */
-    int (*tclpCreateProcess) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr)); /* 4 */
+    void (*tclGetAndDetachPids) (Tcl_Interp * interp, Tcl_Channel chan); /* 0 */
+    int (*tclpCloseFile) (TclFile file); /* 1 */
+    Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr); /* 2 */
+    int (*tclpCreatePipe) (TclFile * readPipe, TclFile * writePipe); /* 3 */
+    int (*tclpCreateProcess) (Tcl_Interp * interp, int argc, CONST char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr); /* 4 */
     void *reserved5;
-    TclFile (*tclpMakeFile) _ANSI_ARGS_((Tcl_Channel channel, int direction)); /* 6 */
-    TclFile (*tclpOpenFile) _ANSI_ARGS_((CONST char * fname, int mode)); /* 7 */
-    int (*tclUnixWaitForFile) _ANSI_ARGS_((int fd, int mask, int timeout)); /* 8 */
-    TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char * contents)); /* 9 */
-    Tcl_DirEntry * (*tclpReaddir) _ANSI_ARGS_((DIR * dir)); /* 10 */
-    struct tm * (*tclpLocaltime_unix) _ANSI_ARGS_((CONST time_t * clock)); /* 11 */
-    struct tm * (*tclpGmtime_unix) _ANSI_ARGS_((CONST time_t * clock)); /* 12 */
-    char * (*tclpInetNtoa) _ANSI_ARGS_((struct in_addr addr)); /* 13 */
-    int (*tclUnixCopyFile) _ANSI_ARGS_((CONST char * src, CONST char * dst, CONST Tcl_StatBuf * statBufPtr, int dontCopyAtts)); /* 14 */
+    TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 6 */
+    TclFile (*tclpOpenFile) (CONST char * fname, int mode); /* 7 */
+    int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
+    TclFile (*tclpCreateTempFile) (CONST char * contents); /* 9 */
+    Tcl_DirEntry * (*tclpReaddir) (DIR * dir); /* 10 */
+    struct tm * (*tclpLocaltime_unix) (CONST time_t * clock); /* 11 */
+    struct tm * (*tclpGmtime_unix) (CONST time_t * clock); /* 12 */
+    char * (*tclpInetNtoa) (struct in_addr addr); /* 13 */
+    int (*tclUnixCopyFile) (CONST char * src, CONST char * dst, CONST Tcl_StatBuf * statBufPtr, int dontCopyAtts); /* 14 */
 #endif /* UNIX */
 #ifdef __WIN32__
-    void (*tclWinConvertError) _ANSI_ARGS_((DWORD errCode)); /* 0 */
-    void (*tclWinConvertWSAError) _ANSI_ARGS_((DWORD errCode)); /* 1 */
-    struct servent * (*tclWinGetServByName) _ANSI_ARGS_((CONST char * nm, CONST char * proto)); /* 2 */
-    int (*tclWinGetSockOpt) _ANSI_ARGS_((int s, int level, int optname, char FAR * optval, int FAR * optlen)); /* 3 */
-    HINSTANCE (*tclWinGetTclInstance) _ANSI_ARGS_((void)); /* 4 */
+    void (*tclWinConvertError) (DWORD errCode); /* 0 */
+    void (*tclWinConvertWSAError) (DWORD errCode); /* 1 */
+    struct servent * (*tclWinGetServByName) (CONST char * nm, CONST char * proto); /* 2 */
+    int (*tclWinGetSockOpt) (int s, int level, int optname, char FAR * optval, int FAR * optlen); /* 3 */
+    HINSTANCE (*tclWinGetTclInstance) (void); /* 4 */
     void *reserved5;
-    u_short (*tclWinNToHS) _ANSI_ARGS_((u_short ns)); /* 6 */
-    int (*tclWinSetSockOpt) _ANSI_ARGS_((int s, int level, int optname, CONST char FAR * optval, int optlen)); /* 7 */
-    unsigned long (*tclpGetPid) _ANSI_ARGS_((Tcl_Pid pid)); /* 8 */
-    int (*tclWinGetPlatformId) _ANSI_ARGS_((void)); /* 9 */
+    u_short (*tclWinNToHS) (u_short ns); /* 6 */
+    int (*tclWinSetSockOpt) (int s, int level, int optname, CONST char FAR * optval, int optlen); /* 7 */
+    unsigned long (*tclpGetPid) (Tcl_Pid pid); /* 8 */
+    int (*tclWinGetPlatformId) (void); /* 9 */
     void *reserved10;
-    void (*tclGetAndDetachPids) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 11 */
-    int (*tclpCloseFile) _ANSI_ARGS_((TclFile file)); /* 12 */
-    Tcl_Channel (*tclpCreateCommandChannel) _ANSI_ARGS_((TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr)); /* 13 */
-    int (*tclpCreatePipe) _ANSI_ARGS_((TclFile * readPipe, TclFile * writePipe)); /* 14 */
-    int (*tclpCreateProcess) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr)); /* 15 */
+    void (*tclGetAndDetachPids) (Tcl_Interp * interp, Tcl_Channel chan); /* 11 */
+    int (*tclpCloseFile) (TclFile file); /* 12 */
+    Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr); /* 13 */
+    int (*tclpCreatePipe) (TclFile * readPipe, TclFile * writePipe); /* 14 */
+    int (*tclpCreateProcess) (Tcl_Interp * interp, int argc, CONST char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr); /* 15 */
     void *reserved16;
     void *reserved17;
-    TclFile (*tclpMakeFile) _ANSI_ARGS_((Tcl_Channel channel, int direction)); /* 18 */
-    TclFile (*tclpOpenFile) _ANSI_ARGS_((CONST char * fname, int mode)); /* 19 */
-    void (*tclWinAddProcess) _ANSI_ARGS_((HANDLE hProcess, DWORD id)); /* 20 */
+    TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 18 */
+    TclFile (*tclpOpenFile) (CONST char * fname, int mode); /* 19 */
+    void (*tclWinAddProcess) (HANDLE hProcess, DWORD id); /* 20 */
     void *reserved21;
-    TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char * contents)); /* 22 */
-    char * (*tclpGetTZName) _ANSI_ARGS_((int isdst)); /* 23 */
-    char * (*tclWinNoBackslash) _ANSI_ARGS_((char * path)); /* 24 */
+    TclFile (*tclpCreateTempFile) (CONST char * contents); /* 22 */
+    char * (*tclpGetTZName) (int isdst); /* 23 */
+    char * (*tclWinNoBackslash) (char * path); /* 24 */
     void *reserved25;
-    void (*tclWinSetInterfaces) _ANSI_ARGS_((int wide)); /* 26 */
-    void (*tclWinFlushDirtyChannels) _ANSI_ARGS_((void)); /* 27 */
-    void (*tclWinResetInterfaces) _ANSI_ARGS_((void)); /* 28 */
-    int (*tclWinCPUID) _ANSI_ARGS_((unsigned int index, unsigned int * regs)); /* 29 */
+    void (*tclWinSetInterfaces) (int wide); /* 26 */
+    void (*tclWinFlushDirtyChannels) (void); /* 27 */
+    void (*tclWinResetInterfaces) (void); /* 28 */
+    int (*tclWinCPUID) (unsigned int index, unsigned int * regs); /* 29 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TCL
-    int (*tclMacOSXGetFileAttribute) _ANSI_ARGS_((Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj ** attributePtrPtr)); /* 15 */
-    int (*tclMacOSXSetFileAttribute) _ANSI_ARGS_((Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj * attributePtr)); /* 16 */
-    int (*tclMacOSXCopyFileAttributes) _ANSI_ARGS_((CONST char * src, CONST char * dst, CONST Tcl_StatBuf * statBufPtr)); /* 17 */
-    int (*tclMacOSXMatchType) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * pathName, CONST char * fileName, Tcl_StatBuf * statBufPtr, Tcl_GlobTypeData * types)); /* 18 */
+    int (*tclMacOSXGetFileAttribute) (Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj ** attributePtrPtr); /* 15 */
+    int (*tclMacOSXSetFileAttribute) (Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj * attributePtr); /* 16 */
+    int (*tclMacOSXCopyFileAttributes) (CONST char * src, CONST char * dst, CONST Tcl_StatBuf * statBufPtr); /* 17 */
+    int (*tclMacOSXMatchType) (Tcl_Interp * interp, CONST char * pathName, CONST char * fileName, Tcl_StatBuf * statBufPtr, Tcl_GlobTypeData * types); /* 18 */
 #endif /* MAC_OSX_TCL */
 } TclIntPlatStubs;