[Bug 3508771] load tclreg.dll in cygwin tclsh

Implement TclWinConvertError, TclWinConvertWSAError,
and various more win32-specific internal functions for 
Cygwin, so win32 extensions using those can be
loaded in the cygwin version of tclsh.

1 files changed, 229 insertions, 153 deletions

diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index ec474d4..297895f 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -13,6 +13,16 @@
 #ifndef _TCLINTPLATDECLS
 #define _TCLINTPLATDECLS
 
+#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+EXTERN int TclpCreateProcess _ANSI_ARGS_((Tcl_Interp *interp,
+	int argc, CONST char **argv, TclFile inputFile,
+	TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr));
+EXTERN TclFile TclpMakeFile _ANSI_ARGS_((Tcl_Channel channel,
+	int direction));
+EXTERN TclFile TclpOpenFile _ANSI_ARGS_((CONST char *fname,
+	int mode));
+#endif
+
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
@@ -27,37 +37,33 @@
 
 #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
 /* 0 */
-EXTERN void		TclGetAndDetachPids _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Channel chan));
+EXTERN void		TclWinConvertError _ANSI_ARGS_((unsigned int errCode));
 /* 1 */
-EXTERN int		TclpCloseFile _ANSI_ARGS_((TclFile file));
+EXTERN void		TclWinConvertWSAError _ANSI_ARGS_((
+				unsigned int errCode));
 /* 2 */
 EXTERN Tcl_Channel	TclpCreateCommandChannel _ANSI_ARGS_((
-				TclFile readFile, TclFile writeFile, 
-				TclFile errorFile, int numPids, 
-				Tcl_Pid * pidPtr));
+				TclFile readFile, TclFile writeFile,
+				TclFile errorFile, int numPids,
+				Tcl_Pid *pidPtr));
 /* 3 */
-EXTERN int		TclpCreatePipe _ANSI_ARGS_((TclFile * readPipe, 
-				TclFile * writePipe));
+EXTERN int		TclpCreatePipe _ANSI_ARGS_((TclFile *readPipe,
+				TclFile *writePipe));
 /* 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		TclWinGetTclInstance _ANSI_ARGS_((void));
 /* Slot 5 is reserved */
 /* 6 */
-EXTERN TclFile		TclpMakeFile _ANSI_ARGS_((Tcl_Channel channel, 
-				int direction));
+EXTERN unsigned short	TclWinNToHS _ANSI_ARGS_((unsigned short ns));
 /* 7 */
-EXTERN TclFile		TclpOpenFile _ANSI_ARGS_((CONST char * fname, 
-				int mode));
+EXTERN int		TclWinSetSockOpt _ANSI_ARGS_((int s, int level,
+				int optname, CONST char *optval, int optlen));
 /* 8 */
-EXTERN int		TclUnixWaitForFile _ANSI_ARGS_((int fd, int mask, 
+EXTERN int		TclUnixWaitForFile _ANSI_ARGS_((int fd, int mask,
 				int timeout));
 /* 9 */
 EXTERN int		TclWinGetPlatformId _ANSI_ARGS_((void));
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir _ANSI_ARGS_((DIR * dir));
+EXTERN Tcl_DirEntry *	TclpReaddir _ANSI_ARGS_((DIR *dir));
 /* 11 */
 EXTERN struct tm *	TclpLocaltime_unix _ANSI_ARGS_((
 				TclpTime_t_CONST clock));
@@ -66,25 +72,45 @@ EXTERN struct tm *	TclpGmtime_unix _ANSI_ARGS_((TclpTime_t_CONST clock));
 /* 13 */
 EXTERN char *		TclpInetNtoa _ANSI_ARGS_((struct in_addr addr));
 /* Slot 14 is reserved */
-/* Slot 15 is reserved */
+/* 15 */
+EXTERN int		TclMacOSXGetFileAttribute _ANSI_ARGS_((
+				Tcl_Interp *interp, int objIndex,
+				Tcl_Obj *fileName, Tcl_Obj **attributePtrPtr));
 /* Slot 16 is reserved */
 /* Slot 17 is reserved */
-/* Slot 18 is reserved */
-/* Slot 19 is reserved */
-/* Slot 20 is reserved */
+/* 18 */
+EXTERN int		TclMacOSXMatchType _ANSI_ARGS_((Tcl_Interp *interp,
+				CONST char *pathName, CONST char *fileName,
+				Tcl_StatBuf *statBufPtr,
+				Tcl_GlobTypeData *types));
+/* 19 */
+EXTERN void		TclMacOSXNotifierAddRunLoopMode _ANSI_ARGS_((
+				CONST void *runLoopMode));
+/* 20 */
+EXTERN void		TclWinAddProcess _ANSI_ARGS_((void *hProcess,
+				unsigned long id));
 /* Slot 21 is reserved */
 /* 22 */
-EXTERN TclFile		TclpCreateTempFile _ANSI_ARGS_((
-				CONST char * contents));
-/* Slot 23 is reserved */
-/* Slot 24 is reserved */
+EXTERN TclFile		TclpCreateTempFile _ANSI_ARGS_((CONST char *contents));
+/* 23 */
+EXTERN char *		TclpGetTZName _ANSI_ARGS_((int isdst));
+/* 24 */
+EXTERN char *		TclWinNoBackslash _ANSI_ARGS_((char *path));
 /* Slot 25 is reserved */
-/* Slot 26 is reserved */
-/* Slot 27 is reserved */
-/* Slot 28 is reserved */
+/* 26 */
+EXTERN void		TclWinSetInterfaces _ANSI_ARGS_((int wide));
+/* 27 */
+EXTERN void		TclWinFlushDirtyChannels _ANSI_ARGS_((void));
+/* 28 */
+EXTERN void		TclWinResetInterfaces _ANSI_ARGS_((void));
 /* 29 */
-EXTERN int		TclWinCPUID _ANSI_ARGS_((unsigned int index, 
-				unsigned int * regs));
+EXTERN int		TclWinCPUID _ANSI_ARGS_((unsigned int index,
+				unsigned int *regs));
+/* 30 */
+EXTERN void		TclGetAndDetachPids _ANSI_ARGS_((Tcl_Interp *interp,
+				Tcl_Channel chan));
+/* 31 */
+EXTERN int		TclpCloseFile _ANSI_ARGS_((TclFile file));
 #endif /* UNIX */
 #ifdef __WIN32__
 /* 0 */
@@ -92,20 +118,20 @@ EXTERN void		TclWinConvertError _ANSI_ARGS_((DWORD errCode));
 /* 1 */
 EXTERN void		TclWinConvertWSAError _ANSI_ARGS_((DWORD errCode));
 /* 2 */
-EXTERN struct servent *	 TclWinGetServByName _ANSI_ARGS_((CONST char * nm, 
-				CONST char * proto));
+EXTERN struct servent *	 TclWinGetServByName _ANSI_ARGS_((CONST char *nm,
+				CONST char *proto));
 /* 3 */
-EXTERN int		TclWinGetSockOpt _ANSI_ARGS_((SOCKET s, int level, 
-				int optname, char FAR * optval, 
-				int FAR * optlen));
+EXTERN int		TclWinGetSockOpt _ANSI_ARGS_((SOCKET s, int level,
+				int optname, char FAR *optval,
+				int FAR *optlen));
 /* 4 */
 EXTERN HINSTANCE	TclWinGetTclInstance _ANSI_ARGS_((void));
 /* Slot 5 is reserved */
 /* 6 */
 EXTERN u_short		TclWinNToHS _ANSI_ARGS_((u_short ns));
 /* 7 */
-EXTERN int		TclWinSetSockOpt _ANSI_ARGS_((SOCKET s, int level, 
-				int optname, CONST char FAR * optval, 
+EXTERN int		TclWinSetSockOpt _ANSI_ARGS_((SOCKET s, int level,
+				int optname, CONST char FAR *optval,
 				int optlen));
 /* 8 */
 EXTERN unsigned long	TclpGetPid _ANSI_ARGS_((Tcl_Pid pid));
@@ -113,42 +139,41 @@ EXTERN unsigned long	TclpGetPid _ANSI_ARGS_((Tcl_Pid pid));
 EXTERN int		TclWinGetPlatformId _ANSI_ARGS_((void));
 /* Slot 10 is reserved */
 /* 11 */
-EXTERN void		TclGetAndDetachPids _ANSI_ARGS_((Tcl_Interp * interp, 
+EXTERN void		TclGetAndDetachPids _ANSI_ARGS_((Tcl_Interp *interp,
 				Tcl_Channel chan));
 /* 12 */
 EXTERN int		TclpCloseFile _ANSI_ARGS_((TclFile file));
 /* 13 */
 EXTERN Tcl_Channel	TclpCreateCommandChannel _ANSI_ARGS_((
-				TclFile readFile, TclFile writeFile, 
-				TclFile errorFile, int numPids, 
-				Tcl_Pid * pidPtr));
+				TclFile readFile, TclFile writeFile,
+				TclFile errorFile, int numPids,
+				Tcl_Pid *pidPtr));
 /* 14 */
-EXTERN int		TclpCreatePipe _ANSI_ARGS_((TclFile * readPipe, 
-				TclFile * writePipe));
+EXTERN int		TclpCreatePipe _ANSI_ARGS_((TclFile *readPipe,
+				TclFile *writePipe));
 /* 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 _ANSI_ARGS_((Tcl_Interp *interp,
+				int argc, CONST char **argv,
+				TclFile inputFile, TclFile outputFile,
+				TclFile errorFile, Tcl_Pid *pidPtr));
 /* Slot 16 is reserved */
 /* Slot 17 is reserved */
 /* 18 */
-EXTERN TclFile		TclpMakeFile _ANSI_ARGS_((Tcl_Channel channel, 
+EXTERN TclFile		TclpMakeFile _ANSI_ARGS_((Tcl_Channel channel,
 				int direction));
 /* 19 */
-EXTERN TclFile		TclpOpenFile _ANSI_ARGS_((CONST char * fname, 
+EXTERN TclFile		TclpOpenFile _ANSI_ARGS_((CONST char *fname,
 				int mode));
 /* 20 */
-EXTERN void		TclWinAddProcess _ANSI_ARGS_((HANDLE hProcess, 
+EXTERN void		TclWinAddProcess _ANSI_ARGS_((HANDLE hProcess,
 				DWORD id));
 /* Slot 21 is reserved */
 /* 22 */
-EXTERN TclFile		TclpCreateTempFile _ANSI_ARGS_((
-				CONST char * contents));
+EXTERN TclFile		TclpCreateTempFile _ANSI_ARGS_((CONST char *contents));
 /* 23 */
 EXTERN char *		TclpGetTZName _ANSI_ARGS_((int isdst));
 /* 24 */
-EXTERN char *		TclWinNoBackslash _ANSI_ARGS_((char * path));
+EXTERN char *		TclWinNoBackslash _ANSI_ARGS_((char *path));
 /* 25 */
 EXTERN TclPlatformType * TclWinGetPlatform _ANSI_ARGS_((void));
 /* 26 */
@@ -158,16 +183,16 @@ EXTERN void		TclWinFlushDirtyChannels _ANSI_ARGS_((void));
 /* 28 */
 EXTERN void		TclWinResetInterfaces _ANSI_ARGS_((void));
 /* 29 */
-EXTERN int		TclWinCPUID _ANSI_ARGS_((unsigned int index, 
-				unsigned int * regs));
+EXTERN int		TclWinCPUID _ANSI_ARGS_((unsigned int index,
+				unsigned int *regs));
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
 /* 0 */
 EXTERN VOID *		TclpSysAlloc _ANSI_ARGS_((long size, int isBin));
 /* 1 */
-EXTERN void		TclpSysFree _ANSI_ARGS_((VOID * ptr));
+EXTERN void		TclpSysFree _ANSI_ARGS_((VOID *ptr));
 /* 2 */
-EXTERN VOID *		TclpSysRealloc _ANSI_ARGS_((VOID * cp, 
+EXTERN VOID *		TclpSysRealloc _ANSI_ARGS_((VOID *cp,
 				unsigned int size));
 /* 3 */
 EXTERN void		TclpExit _ANSI_ARGS_((int status));
@@ -176,28 +201,27 @@ EXTERN int		FSpGetDefaultDir _ANSI_ARGS_((FSSpecPtr theSpec));
 /* 5 */
 EXTERN int		FSpSetDefaultDir _ANSI_ARGS_((FSSpecPtr theSpec));
 /* 6 */
-EXTERN OSErr		FSpFindFolder _ANSI_ARGS_((short vRefNum, 
-				OSType folderType, Boolean createFolder, 
-				FSSpec * spec));
+EXTERN OSErr		FSpFindFolder _ANSI_ARGS_((short vRefNum,
+				OSType folderType, Boolean createFolder,
+				FSSpec *spec));
 /* 7 */
-EXTERN void		GetGlobalMouseTcl _ANSI_ARGS_((Point * mouse));
+EXTERN void		GetGlobalMouseTcl _ANSI_ARGS_((Point *mouse));
 /* 8 */
-EXTERN pascal OSErr	FSpGetDirectoryIDTcl _ANSI_ARGS_((
-				CONST FSSpec * spec, long * theDirID, 
-				Boolean * isDirectory));
+EXTERN pascal OSErr	FSpGetDirectoryIDTcl _ANSI_ARGS_((CONST FSSpec *spec,
+				long *theDirID, Boolean *isDirectory));
 /* 9 */
 EXTERN pascal short	FSpOpenResFileCompatTcl _ANSI_ARGS_((
-				CONST FSSpec * spec, SignedByte permission));
+				CONST FSSpec *spec, SignedByte permission));
 /* 10 */
 EXTERN pascal void	FSpCreateResFileCompatTcl _ANSI_ARGS_((
-				CONST FSSpec * spec, OSType creator, 
+				CONST FSSpec *spec, OSType creator,
 				OSType fileType, ScriptCode scriptTag));
 /* 11 */
-EXTERN int		FSpLocationFromPath _ANSI_ARGS_((int length, 
-				CONST char * path, FSSpecPtr theSpec));
+EXTERN int		FSpLocationFromPath _ANSI_ARGS_((int length,
+				CONST char *path, FSSpecPtr theSpec));
 /* 12 */
-EXTERN OSErr		FSpPathFromLocation _ANSI_ARGS_((FSSpecPtr theSpec, 
-				int * length, Handle * fullPath));
+EXTERN OSErr		FSpPathFromLocation _ANSI_ARGS_((FSSpecPtr theSpec,
+				int *length, Handle *fullPath));
 /* 13 */
 EXTERN void		TclMacExitHandler _ANSI_ARGS_((void));
 /* 14 */
@@ -208,30 +232,29 @@ EXTERN OSErr		TclMacInstallExitToShellPatch _ANSI_ARGS_((
 /* 16 */
 EXTERN int		TclMacOSErrorToPosixError _ANSI_ARGS_((int error));
 /* 17 */
-EXTERN void		TclMacRemoveTimer _ANSI_ARGS_((VOID * timerToken));
+EXTERN void		TclMacRemoveTimer _ANSI_ARGS_((VOID *timerToken));
 /* 18 */
 EXTERN VOID *		TclMacStartTimer _ANSI_ARGS_((long ms));
 /* 19 */
-EXTERN int		TclMacTimerExpired _ANSI_ARGS_((VOID * timerToken));
+EXTERN int		TclMacTimerExpired _ANSI_ARGS_((VOID *timerToken));
 /* 20 */
 EXTERN int		TclMacRegisterResourceFork _ANSI_ARGS_((
-				short fileRef, Tcl_Obj * tokenPtr, 
-				int insert));
+				short fileRef, Tcl_Obj *tokenPtr, int insert));
 /* 21 */
 EXTERN short		TclMacUnRegisterResourceFork _ANSI_ARGS_((
-				char * tokenPtr, Tcl_Obj * resultPtr));
+				char *tokenPtr, Tcl_Obj *resultPtr));
 /* 22 */
 EXTERN int		TclMacCreateEnv _ANSI_ARGS_((void));
 /* 23 */
-EXTERN FILE *		TclMacFOpenHack _ANSI_ARGS_((CONST char * path, 
-				CONST char * mode));
+EXTERN FILE *		TclMacFOpenHack _ANSI_ARGS_((CONST char *path,
+				CONST char *mode));
 /* 24 */
 EXTERN char *		TclpGetTZName _ANSI_ARGS_((int isdst));
 /* 25 */
-EXTERN int		TclMacChmod _ANSI_ARGS_((CONST char * path, int mode));
+EXTERN int		TclMacChmod _ANSI_ARGS_((CONST char *path, int mode));
 /* 26 */
-EXTERN int		FSpLLocationFromPath _ANSI_ARGS_((int length, 
-				CONST char * path, FSSpecPtr theSpec));
+EXTERN int		FSpLLocationFromPath _ANSI_ARGS_((int length,
+				CONST char *path, FSSpecPtr theSpec));
 #endif /* MAC_TCL */
 
 typedef struct TclIntPlatStubs {
@@ -239,97 +262,99 @@ typedef struct TclIntPlatStubs {
     struct TclIntPlatStubHooks *hooks;
 
 #if !defined(__WIN32__) && !defined(MAC_TCL) /* 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 (*tclWinConvertError) _ANSI_ARGS_((unsigned int errCode)); /* 0 */
+    void (*tclWinConvertWSAError) _ANSI_ARGS_((unsigned int errCode)); /* 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 (*tclWinGetTclInstance) _ANSI_ARGS_((void)); /* 4 */
     void *reserved5;
-    TclFile (*tclpMakeFile) _ANSI_ARGS_((Tcl_Channel channel, int direction)); /* 6 */
-    TclFile (*tclpOpenFile) _ANSI_ARGS_((CONST char * fname, int mode)); /* 7 */
+    unsigned short (*tclWinNToHS) _ANSI_ARGS_((unsigned short ns)); /* 6 */
+    int (*tclWinSetSockOpt) _ANSI_ARGS_((int s, int level, int optname, CONST char *optval, int optlen)); /* 7 */
     int (*tclUnixWaitForFile) _ANSI_ARGS_((int fd, int mask, int timeout)); /* 8 */
     int (*tclWinGetPlatformId) _ANSI_ARGS_((void)); /* 9 */
-    Tcl_DirEntry * (*tclpReaddir) _ANSI_ARGS_((DIR * dir)); /* 10 */
+    Tcl_DirEntry * (*tclpReaddir) _ANSI_ARGS_((DIR *dir)); /* 10 */
     struct tm * (*tclpLocaltime_unix) _ANSI_ARGS_((TclpTime_t_CONST clock)); /* 11 */
     struct tm * (*tclpGmtime_unix) _ANSI_ARGS_((TclpTime_t_CONST clock)); /* 12 */
     char * (*tclpInetNtoa) _ANSI_ARGS_((struct in_addr addr)); /* 13 */
     void *reserved14;
-    void *reserved15;
+    int (*tclMacOSXGetFileAttribute) _ANSI_ARGS_((Tcl_Interp *interp, int objIndex, Tcl_Obj *fileName, Tcl_Obj **attributePtrPtr)); /* 15 */
     void *reserved16;
     void *reserved17;
-    void *reserved18;
-    void *reserved19;
-    void *reserved20;
+    int (*tclMacOSXMatchType) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *pathName, CONST char *fileName, Tcl_StatBuf *statBufPtr, Tcl_GlobTypeData *types)); /* 18 */
+    void (*tclMacOSXNotifierAddRunLoopMode) _ANSI_ARGS_((CONST void *runLoopMode)); /* 19 */
+    void (*tclWinAddProcess) _ANSI_ARGS_((void *hProcess, unsigned long id)); /* 20 */
     void *reserved21;
-    TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char * contents)); /* 22 */
-    void *reserved23;
-    void *reserved24;
+    TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char *contents)); /* 22 */
+    char * (*tclpGetTZName) _ANSI_ARGS_((int isdst)); /* 23 */
+    char * (*tclWinNoBackslash) _ANSI_ARGS_((char *path)); /* 24 */
     void *reserved25;
-    void *reserved26;
-    void *reserved27;
-    void *reserved28;
-    int (*tclWinCPUID) _ANSI_ARGS_((unsigned int index, unsigned int * regs)); /* 29 */
+    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 (*tclGetAndDetachPids) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Channel chan)); /* 30 */
+    int (*tclpCloseFile) _ANSI_ARGS_((TclFile file)); /* 31 */
 #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_((SOCKET s, int level, int optname, char FAR * optval, int FAR * optlen)); /* 3 */
+    struct servent * (*tclWinGetServByName) _ANSI_ARGS_((CONST char *nm, CONST char *proto)); /* 2 */
+    int (*tclWinGetSockOpt) _ANSI_ARGS_((SOCKET s, int level, int optname, char FAR *optval, int FAR *optlen)); /* 3 */
     HINSTANCE (*tclWinGetTclInstance) _ANSI_ARGS_((void)); /* 4 */
     void *reserved5;
     u_short (*tclWinNToHS) _ANSI_ARGS_((u_short ns)); /* 6 */
-    int (*tclWinSetSockOpt) _ANSI_ARGS_((SOCKET s, int level, int optname, CONST char FAR * optval, int optlen)); /* 7 */
+    int (*tclWinSetSockOpt) _ANSI_ARGS_((SOCKET 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 */
     void *reserved10;
-    void (*tclGetAndDetachPids) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 11 */
+    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 */
+    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 *reserved16;
     void *reserved17;
     TclFile (*tclpMakeFile) _ANSI_ARGS_((Tcl_Channel channel, int direction)); /* 18 */
-    TclFile (*tclpOpenFile) _ANSI_ARGS_((CONST char * fname, int mode)); /* 19 */
+    TclFile (*tclpOpenFile) _ANSI_ARGS_((CONST char *fname, int mode)); /* 19 */
     void (*tclWinAddProcess) _ANSI_ARGS_((HANDLE hProcess, DWORD id)); /* 20 */
     void *reserved21;
-    TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char * contents)); /* 22 */
+    TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char *contents)); /* 22 */
     char * (*tclpGetTZName) _ANSI_ARGS_((int isdst)); /* 23 */
-    char * (*tclWinNoBackslash) _ANSI_ARGS_((char * path)); /* 24 */
+    char * (*tclWinNoBackslash) _ANSI_ARGS_((char *path)); /* 24 */
     TclPlatformType * (*tclWinGetPlatform) _ANSI_ARGS_((void)); /* 25 */
     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 */
+    int (*tclWinCPUID) _ANSI_ARGS_((unsigned int index, unsigned int *regs)); /* 29 */
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
     VOID * (*tclpSysAlloc) _ANSI_ARGS_((long size, int isBin)); /* 0 */
-    void (*tclpSysFree) _ANSI_ARGS_((VOID * ptr)); /* 1 */
-    VOID * (*tclpSysRealloc) _ANSI_ARGS_((VOID * cp, unsigned int size)); /* 2 */
+    void (*tclpSysFree) _ANSI_ARGS_((VOID *ptr)); /* 1 */
+    VOID * (*tclpSysRealloc) _ANSI_ARGS_((VOID *cp, unsigned int size)); /* 2 */
     void (*tclpExit) _ANSI_ARGS_((int status)); /* 3 */
     int (*fSpGetDefaultDir) _ANSI_ARGS_((FSSpecPtr theSpec)); /* 4 */
     int (*fSpSetDefaultDir) _ANSI_ARGS_((FSSpecPtr theSpec)); /* 5 */
-    OSErr (*fSpFindFolder) _ANSI_ARGS_((short vRefNum, OSType folderType, Boolean createFolder, FSSpec * spec)); /* 6 */
-    void (*getGlobalMouseTcl) _ANSI_ARGS_((Point * mouse)); /* 7 */
-    pascal OSErr (*fSpGetDirectoryIDTcl) _ANSI_ARGS_((CONST FSSpec * spec, long * theDirID, Boolean * isDirectory)); /* 8 */
-    pascal short (*fSpOpenResFileCompatTcl) _ANSI_ARGS_((CONST FSSpec * spec, SignedByte permission)); /* 9 */
-    pascal void (*fSpCreateResFileCompatTcl) _ANSI_ARGS_((CONST FSSpec * spec, OSType creator, OSType fileType, ScriptCode scriptTag)); /* 10 */
-    int (*fSpLocationFromPath) _ANSI_ARGS_((int length, CONST char * path, FSSpecPtr theSpec)); /* 11 */
-    OSErr (*fSpPathFromLocation) _ANSI_ARGS_((FSSpecPtr theSpec, int * length, Handle * fullPath)); /* 12 */
+    OSErr (*fSpFindFolder) _ANSI_ARGS_((short vRefNum, OSType folderType, Boolean createFolder, FSSpec *spec)); /* 6 */
+    void (*getGlobalMouseTcl) _ANSI_ARGS_((Point *mouse)); /* 7 */
+    pascal OSErr (*fSpGetDirectoryIDTcl) _ANSI_ARGS_((CONST FSSpec *spec, long *theDirID, Boolean *isDirectory)); /* 8 */
+    pascal short (*fSpOpenResFileCompatTcl) _ANSI_ARGS_((CONST FSSpec *spec, SignedByte permission)); /* 9 */
+    pascal void (*fSpCreateResFileCompatTcl) _ANSI_ARGS_((CONST FSSpec *spec, OSType creator, OSType fileType, ScriptCode scriptTag)); /* 10 */
+    int (*fSpLocationFromPath) _ANSI_ARGS_((int length, CONST char *path, FSSpecPtr theSpec)); /* 11 */
+    OSErr (*fSpPathFromLocation) _ANSI_ARGS_((FSSpecPtr theSpec, int *length, Handle *fullPath)); /* 12 */
     void (*tclMacExitHandler) _ANSI_ARGS_((void)); /* 13 */
     void (*tclMacInitExitToShell) _ANSI_ARGS_((int usePatch)); /* 14 */
     OSErr (*tclMacInstallExitToShellPatch) _ANSI_ARGS_((ExitToShellProcPtr newProc)); /* 15 */
     int (*tclMacOSErrorToPosixError) _ANSI_ARGS_((int error)); /* 16 */
-    void (*tclMacRemoveTimer) _ANSI_ARGS_((VOID * timerToken)); /* 17 */
+    void (*tclMacRemoveTimer) _ANSI_ARGS_((VOID *timerToken)); /* 17 */
     VOID * (*tclMacStartTimer) _ANSI_ARGS_((long ms)); /* 18 */
-    int (*tclMacTimerExpired) _ANSI_ARGS_((VOID * timerToken)); /* 19 */
-    int (*tclMacRegisterResourceFork) _ANSI_ARGS_((short fileRef, Tcl_Obj * tokenPtr, int insert)); /* 20 */
-    short (*tclMacUnRegisterResourceFork) _ANSI_ARGS_((char * tokenPtr, Tcl_Obj * resultPtr)); /* 21 */
+    int (*tclMacTimerExpired) _ANSI_ARGS_((VOID *timerToken)); /* 19 */
+    int (*tclMacRegisterResourceFork) _ANSI_ARGS_((short fileRef, Tcl_Obj *tokenPtr, int insert)); /* 20 */
+    short (*tclMacUnRegisterResourceFork) _ANSI_ARGS_((char *tokenPtr, Tcl_Obj *resultPtr)); /* 21 */
     int (*tclMacCreateEnv) _ANSI_ARGS_((void)); /* 22 */
-    FILE * (*tclMacFOpenHack) _ANSI_ARGS_((CONST char * path, CONST char * mode)); /* 23 */
+    FILE * (*tclMacFOpenHack) _ANSI_ARGS_((CONST char *path, CONST char *mode)); /* 23 */
     char * (*tclpGetTZName) _ANSI_ARGS_((int isdst)); /* 24 */
-    int (*tclMacChmod) _ANSI_ARGS_((CONST char * path, int mode)); /* 25 */
-    int (*fSpLLocationFromPath) _ANSI_ARGS_((int length, CONST char * path, FSSpecPtr theSpec)); /* 26 */
+    int (*tclMacChmod) _ANSI_ARGS_((CONST char *path, int mode)); /* 25 */
+    int (*fSpLLocationFromPath) _ANSI_ARGS_((int length, CONST char *path, FSSpecPtr theSpec)); /* 26 */
 #endif /* MAC_TCL */
 } TclIntPlatStubs;
 
@@ -348,13 +373,13 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
  */
 
 #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-#ifndef TclGetAndDetachPids
-#define TclGetAndDetachPids \
-	(tclIntPlatStubsPtr->tclGetAndDetachPids) /* 0 */
+#ifndef TclWinConvertError
+#define TclWinConvertError \
+	(tclIntPlatStubsPtr->tclWinConvertError) /* 0 */
 #endif
-#ifndef TclpCloseFile
-#define TclpCloseFile \
-	(tclIntPlatStubsPtr->tclpCloseFile) /* 1 */
+#ifndef TclWinConvertWSAError
+#define TclWinConvertWSAError \
+	(tclIntPlatStubsPtr->tclWinConvertWSAError) /* 1 */
 #endif
 #ifndef TclpCreateCommandChannel
 #define TclpCreateCommandChannel \
@@ -364,18 +389,18 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
 #define TclpCreatePipe \
 	(tclIntPlatStubsPtr->tclpCreatePipe) /* 3 */
 #endif
-#ifndef TclpCreateProcess
-#define TclpCreateProcess \
-	(tclIntPlatStubsPtr->tclpCreateProcess) /* 4 */
+#ifndef TclWinGetTclInstance
+#define TclWinGetTclInstance \
+	(tclIntPlatStubsPtr->tclWinGetTclInstance) /* 4 */
 #endif
 /* Slot 5 is reserved */
-#ifndef TclpMakeFile
-#define TclpMakeFile \
-	(tclIntPlatStubsPtr->tclpMakeFile) /* 6 */
+#ifndef TclWinNToHS
+#define TclWinNToHS \
+	(tclIntPlatStubsPtr->tclWinNToHS) /* 6 */
 #endif
-#ifndef TclpOpenFile
-#define TclpOpenFile \
-	(tclIntPlatStubsPtr->tclpOpenFile) /* 7 */
+#ifndef TclWinSetSockOpt
+#define TclWinSetSockOpt \
+	(tclIntPlatStubsPtr->tclWinSetSockOpt) /* 7 */
 #endif
 #ifndef TclUnixWaitForFile
 #define TclUnixWaitForFile \
@@ -402,27 +427,62 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
 	(tclIntPlatStubsPtr->tclpInetNtoa) /* 13 */
 #endif
 /* Slot 14 is reserved */
-/* Slot 15 is reserved */
+#ifndef TclMacOSXGetFileAttribute
+#define TclMacOSXGetFileAttribute \
+	(tclIntPlatStubsPtr->tclMacOSXGetFileAttribute) /* 15 */
+#endif
 /* Slot 16 is reserved */
 /* Slot 17 is reserved */
-/* Slot 18 is reserved */
-/* Slot 19 is reserved */
-/* Slot 20 is reserved */
+#ifndef TclMacOSXMatchType
+#define TclMacOSXMatchType \
+	(tclIntPlatStubsPtr->tclMacOSXMatchType) /* 18 */
+#endif
+#ifndef TclMacOSXNotifierAddRunLoopMode
+#define TclMacOSXNotifierAddRunLoopMode \
+	(tclIntPlatStubsPtr->tclMacOSXNotifierAddRunLoopMode) /* 19 */
+#endif
+#ifndef TclWinAddProcess
+#define TclWinAddProcess \
+	(tclIntPlatStubsPtr->tclWinAddProcess) /* 20 */
+#endif
 /* Slot 21 is reserved */
 #ifndef TclpCreateTempFile
 #define TclpCreateTempFile \
 	(tclIntPlatStubsPtr->tclpCreateTempFile) /* 22 */
 #endif
-/* Slot 23 is reserved */
-/* Slot 24 is reserved */
+#ifndef TclpGetTZName
+#define TclpGetTZName \
+	(tclIntPlatStubsPtr->tclpGetTZName) /* 23 */
+#endif
+#ifndef TclWinNoBackslash
+#define TclWinNoBackslash \
+	(tclIntPlatStubsPtr->tclWinNoBackslash) /* 24 */
+#endif
 /* Slot 25 is reserved */
-/* Slot 26 is reserved */
-/* Slot 27 is reserved */
-/* Slot 28 is reserved */
+#ifndef TclWinSetInterfaces
+#define TclWinSetInterfaces \
+	(tclIntPlatStubsPtr->tclWinSetInterfaces) /* 26 */
+#endif
+#ifndef TclWinFlushDirtyChannels
+#define TclWinFlushDirtyChannels \
+	(tclIntPlatStubsPtr->tclWinFlushDirtyChannels) /* 27 */
+#endif
+#ifndef TclWinResetInterfaces
+#define TclWinResetInterfaces \
+	(tclIntPlatStubsPtr->tclWinResetInterfaces) /* 28 */
+#endif
 #ifndef TclWinCPUID
 #define TclWinCPUID \
 	(tclIntPlatStubsPtr->tclWinCPUID) /* 29 */
 #endif
+#ifndef TclGetAndDetachPids
+#define TclGetAndDetachPids \
+	(tclIntPlatStubsPtr->tclGetAndDetachPids) /* 30 */
+#endif
+#ifndef TclpCloseFile
+#define TclpCloseFile \
+	(tclIntPlatStubsPtr->tclpCloseFile) /* 31 */
+#endif
 #endif /* UNIX */
 #ifdef __WIN32__
 #ifndef TclWinConvertError
@@ -651,8 +711,24 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
 
 #if !defined(__WIN32__) && !defined(MAC_TCL) && !defined(__CYGWIN__) && defined(USE_TCL_STUBS)
 #undef TclpCreateTempFile
-#define TclpCreateTempFile \
-	((TclFile (*)_ANSI_ARGS_((CONST char *))) tclIntPlatStubsPtr->tclWinGetPlatformId)
+#define TclpCreateTempFile ((TclFile (*) _ANSI_ARGS_((CONST char *))) \
+	tclIntPlatStubsPtr->tclWinGetPlatformId)
+#undef TclpCreateProcess
+#define TclpCreateProcess ((int (*) _ANSI_ARGS_((Tcl_Interp *, int, \
+	CONST char **, TclFile, TclFile, TclFile, Tcl_Pid *))) \
+	tclIntPlatStubsPtr->tclWinGetTclInstance)
+#undef TclpMakeFile
+#define TclpMakeFile ((TclFile (*) _ANSI_ARGS_((Tcl_Channel channel, \
+	int direction))) tclIntPlatStubsPtr->tclWinNToHS)
+#undef TclpOpenFile
+#define TclpOpenFile ((TclFile (*) _ANSI_ARGS_((CONST char *, int))) \
+	tclIntPlatStubsPtr->tclWinNToHS)
+#undef TclGetAndDetachPids
+#define TclGetAndDetachPids ((void (*) _ANSI_ARGS_((Tcl_Interp *, Tcl_Channel))) \
+	tclIntPlatStubsPtr->tclWinConvertError)
+#undef TclpCloseFile
+#define TclpCloseFile ((int (*) _ANSI_ARGS_((TclFile))) \
+	tclIntPlatStubsPtr->tclWinConvertWSAError)
 #endif
 
 #endif /* _TCLINTPLATDECLS */