* generic/tcl.decls: Added Mac specific declarations.

* generic/tclStubs.c:
* generic/tclStubInit.c: Added undefs for all of the TCL_MEM_DEBUG
macros to avoid conflicts with the stub names.

* generic/tclStubInit.c:
* generic/tclInt.h:
* generic/tclInt.decls: Moved some declarations out of the generic
and into the platform specific sections.  Added missing
declarations and Mac specific declarations.

* generic/tclInt.h:
* generic/tclDate.c:
* generic/tclClock.c: Created a new opaque TclpTime_t type so
generic functions that depend on the format of time_t can appear
in the generic header files.

* generic/tclStubInit.c:
* generic/tclPanic.c:
* generic/tcl.h:
* generic/tcl.decls: renamed Tcl_Panic back to panic to avoid
incompatibilities in a patch release.

1 files changed, 315 insertions, 159 deletions

diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 85d65aa..c51f867 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tclInt.decls,v 1.1 1999/03/03 00:38:40 stanton Exp $
+# RCS: @(#) $Id: tclInt.decls,v 1.2 1999/03/04 01:01:58 stanton Exp $
 
 library tcl
 
@@ -120,407 +120,376 @@ declare 28 generic {
     void TclFreePackageInfo(Interp *iPtr)
 }
 declare 29 generic {
-    void TclGetAndDetachPids(Tcl_Interp *interp, Tcl_Channel chan)
-}
-declare 30 generic {
     char * TclGetCwd(Tcl_Interp *interp)
 }
-declare 31 generic {
+declare 30 generic {
     int TclGetDate(char *p, unsigned long now, long zone, \
 	    unsigned long *timePtr)
 }
-declare 32 generic {
+declare 31 generic {
     Tcl_Channel TclGetDefaultStdChannel(int type)
 }
-declare 33 generic {
+declare 32 generic {
     Tcl_Obj * TclGetElementOfIndexedArray(Tcl_Interp *interp, \
 	    int localIndex, Tcl_Obj *elemPtr, int leaveErrorMsg)
 }
-declare 34 generic {
+declare 33 generic {
     char * TclGetEnv(CONST char *name)
 }
-declare 35 generic {
+declare 34 generic {
     char * TclGetExtension(char *name)
 }
-declare 36 generic {
+declare 35 generic {
     int TclGetFrame(Tcl_Interp *interp, char *string, CallFrame **framePtrPtr)
 }
-declare 37 generic {
+declare 36 generic {
     TclCmdProcType TclGetInterpProc(void)
 }
-declare 38 generic {
+declare 37 generic {
     int TclGetIntForIndex(Tcl_Interp *interp, Tcl_Obj *objPtr, \
 	    int endValue, int *indexPtr)
 }
-declare 39 generic {
+declare 38 generic {
     Tcl_Obj * TclGetIndexedScalar(Tcl_Interp *interp, int localIndex, \
 	    int leaveErrorMsg)
 }
-declare 40 generic {
+declare 39 generic {
     int TclGetLong(Tcl_Interp *interp, char *string, long *longPtr)
 }
-declare 41 generic {
+declare 40 generic {
     int TclGetLoadedPackages(Tcl_Interp *interp, char *targetName)
 }
-declare 42 generic {
+declare 41 generic {
     int TclGetNamespaceForQualName(Tcl_Interp *interp, char *qualName, \
 	    Namespace *cxtNsPtr, int flags, Namespace **nsPtrPtr, \
 	    Namespace **altNsPtrPtr, Namespace **actualCxtPtrPtr, \
 	    char **simpleNamePtr)
 }
-declare 43 generic {
+declare 42 generic {
     TclObjCmdProcType TclGetObjInterpProc(void)
 }
-declare 44 generic {
+declare 43 generic {
     int TclGetOpenMode(Tcl_Interp *interp, char *string, int *seekFlagPtr)
 }
-declare 45 generic {
+declare 44 generic {
     Tcl_Command TclGetOriginalCommand(Tcl_Command command)
 }
-declare 46 generic {
-    char * TclpGetUserHome(char *name, Tcl_DString *bufferPtr)
+declare 45 generic {
+    char * TclGetUserHome(char *name, Tcl_DString *bufferPtr)
 }
-declare 47 generic {
+declare 46 generic {
     int TclGlobalInvoke(Tcl_Interp *interp, int argc, char **argv, int flags)
 }
-declare 48 generic {
+declare 47 generic {
     int TclGuessPackageName(char *fileName, Tcl_DString *bufPtr)
 }
-declare 49 generic {
-    int TclHasSockets(Tcl_Interp *interp)
-}
-declare 50 generic {
+declare 48 generic {
     int TclHideUnsafeCommands(Tcl_Interp *interp)
 }
-declare 51 generic {
+declare 49 generic {
     int TclInExit(void)
 }
-declare 52 generic {
+declare 50 generic {
     Tcl_Obj * TclIncrElementOfIndexedArray(Tcl_Interp *interp, \
 	    int localIndex, Tcl_Obj *elemPtr, long incrAmount)
 }
-declare 53 generic {
+declare 51 generic {
     Tcl_Obj * TclIncrIndexedScalar(Tcl_Interp *interp, int localIndex, \
 	    long incrAmount)
 }
-declare 54 generic {
+declare 52 generic {
     Tcl_Obj * TclIncrVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, \
 	    Tcl_Obj *part2Ptr, long incrAmount, int part1NotParsed)
 }
-declare 55 generic {
+declare 53 generic {
     void TclInitCompiledLocals(Tcl_Interp *interp, CallFrame *framePtr, \
 	    Namespace *nsPtr)
 }
-declare 56 generic {
+declare 54 generic {
     void TclInitNamespaces(void)
 }
-declare 57 generic {
+declare 55 generic {
     int TclInterpInit(Tcl_Interp *interp)
 }
-declare 58 generic {
+declare 56 generic {
     int TclInvoke(Tcl_Interp *interp, int argc, char **argv, int flags)
 }
-declare 59 generic {
+declare 57 generic {
     int TclInvokeObjectCommand(ClientData clientData, Tcl_Interp *interp, \
 	    int argc, char **argv)
 }
-declare 60 generic {
+declare 58 generic {
     int TclInvokeStringCommand(ClientData clientData, Tcl_Interp *interp, \
 	    int objc, Tcl_Obj *CONST objv[])
 }
-declare 61 generic {
+declare 59 generic {
     Proc * TclIsProc(Command *cmdPtr)
 }
-declare 62 generic {
+declare 60 generic {
     int TclLoadFile(Tcl_Interp *interp, char *fileName, char *sym1, \
 	    char *sym2, Tcl_PackageInitProc **proc1Ptr, \
 	    Tcl_PackageInitProc **proc2Ptr)
 }
-declare 63 generic {
+declare 61 generic {
     int TclLooksLikeInt(char *p)
 }
-declare 64 generic {
+declare 62 generic {
     Var * TclLookupVar(Tcl_Interp *interp, char *part1, char *part2, \
 	    int flags, char *msg, int createPart1, int createPart2, \
 	    Var **arrayPtrPtr)
 }
-declare 65 generic {
+declare 63 generic {
     int TclMatchFiles(Tcl_Interp *interp, char *separators, \
 	    Tcl_DString *dirPtr, char *pattern, char *tail)
 }
-declare 66 generic {
+declare 64 generic {
     int TclNeedSpace(char *start, char *end)
 }
-declare 67 generic {
+declare 65 generic {
     Tcl_Obj * TclNewProcBodyObj(Proc *procPtr)
 }
-declare 68 generic {
+declare 66 generic {
     int TclObjCommandComplete(Tcl_Obj *cmdPtr)
 }
-declare 69 generic {
+declare 67 generic {
     int TclObjInterpProc(ClientData clientData, Tcl_Interp *interp, \
 	    int objc, Tcl_Obj *CONST objv[])
 }
-declare 70 generic {
+declare 68 generic {
     int TclObjInvoke(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], \
 	    int flags)
 }
-declare 71 generic {
+declare 69 generic {
     int TclObjInvokeGlobal(Tcl_Interp *interp, int objc, \
 	    Tcl_Obj *CONST objv[], int flags)
 }
-declare 72 generic {
+declare 70 generic {
     int TclOpenFileChannelDeleteProc(TclOpenFileChannelProc_ *proc)
 }
-declare 73 generic {
+declare 71 generic {
     int TclOpenFileChannelInsertProc(TclOpenFileChannelProc_ *proc)
 }
-declare 74 generic {
-    char * TclpAlloc(unsigned int size)
+declare 72 generic {
+    int TclpAccess(CONST char *path, int mode)
 }
-declare 75 generic {
-    int TclpCloseFile(TclFile file)
+declare 73 generic {
+    char * TclpAlloc(unsigned int size)
 }
-declare 76 generic {
+declare 74 generic {
     int TclpCopyFile(char *source, char *dest)
 }
-declare 77 generic {
+declare 75 generic {
     int TclpCopyDirectory(char *source, char *dest, Tcl_DString *errorPtr)
 }
-declare 78 generic {
-    Tcl_Channel TclpCreateCommandChannel(TclFile readFile, \
-	    TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr)
-}
-declare 79 generic {
+declare 76 generic {
     int TclpCreateDirectory(char *path)
 }
-declare 80 generic {
-    int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
-}
-declare 81 generic {
-    int TclpCreateProcess(Tcl_Interp *interp, int argc, char **argv, \
-	    TclFile inputFile, TclFile outputFile, TclFile errorFile, \
-	    Tcl_Pid *pidPtr)
-}
-declare 82 generic {
-    TclFile TclpCreateTempFile(char *contents, 
-    Tcl_DString *namePtr)
-}
-declare 83 generic {
+declare 77 generic {
     int TclpDeleteFile(char *path)
 }
-declare 84 generic {
-    void TclpFinalize(void)
-}
-declare 85 generic {
+declare 78 generic {
     void TclpFree(char *ptr)
 }
-declare 86 generic {
+declare 79 generic {
     unsigned long TclpGetClicks(void)
 }
-declare 87 generic {
+declare 80 generic {
     unsigned long TclpGetSeconds(void)
 }
-declare 88 generic {
+declare 81 generic {
     void TclpGetTime(Tcl_Time *time)
 }
-declare 89 generic {
+declare 82 generic {
     int TclpGetTimeZone(unsigned long time)
 }
-declare 90 generic {
-    char * TclpGetTZName(void)
-}
-declare 91 generic {
+declare 83 generic {
     int TclpListVolumes(Tcl_Interp *interp)
 }
-declare 92 generic {
-    TclFile TclpMakeFile(Tcl_Channel channel, int direction)
-}
-declare 93 generic {
-    TclFile TclpOpenFile(char *fname, int mode)
-}
-declare 94 generic {
+declare 84 generic {
     Tcl_Channel TclpOpenFileChannel(Tcl_Interp *interp, char *fileName, \
 	    char *modeString, int permissions)
 }
-declare 95 generic {
+declare 85 generic {
     char * TclpRealloc(char *ptr, unsigned int size)
 }
-declare 96 generic {
+declare 86 generic {
     int TclpRemoveDirectory(char *path, int recursive, Tcl_DString *errorPtr)
 }
-declare 97 generic {
+declare 87 generic {
     int TclpRenameFile(char *source, char *dest)
 }
-declare 98 generic {
+declare 88 generic {
     int TclParseBraces(Tcl_Interp *interp, char *string, char **termPtr, \
 	    ParseValue *pvPtr)
 }
-declare 99 generic {
+declare 89 generic {
     int TclParseNestedCmd(Tcl_Interp *interp, char *string, int flags, \
 	    char **termPtr, ParseValue *pvPtr)
 }
-declare 100 generic {
+declare 90 generic {
     int TclParseQuotes(Tcl_Interp *interp, char *string, int termChar, \
 	    int flags, char **termPtr, ParseValue *pvPtr)
 }
-declare 101 generic {
+declare 91 generic {
     void TclPlatformInit(Tcl_Interp *interp)
 }
-declare 102 generic {
+declare 92 generic {
     char * TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp, \
 	    char *name1, char *name2, int flags)
 }
-declare 103 generic {
+declare 93 generic {
     int TclPreventAliasLoop(Tcl_Interp *interp, Tcl_Interp *cmdInterp, \
 	    Tcl_Command cmd)
 }
-declare 104 generic {
+declare 94 generic {
     void TclPrintByteCodeObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
 }
-declare 105 generic {
+declare 95 generic {
     void TclProcCleanupProc(Proc *procPtr)
 }
-declare 106 generic {
+declare 96 generic {
     int TclProcCompileProc(Tcl_Interp *interp, Proc *procPtr, \
 	    Tcl_Obj *bodyPtr, Namespace *nsPtr, CONST char *description, \
 	    CONST char *procName)
 }
-declare 107 generic {
+declare 97 generic {
     void TclProcDeleteProc(ClientData clientData)
 }
-declare 108 generic {
+declare 98 generic {
     int TclProcInterpProc(ClientData clientData, Tcl_Interp *interp, \
 	    int argc, char **argv)
 }
-declare 109 generic {
+declare 99 generic {
+    int TclpStat(CONST char *path, struct stat *buf)
+}
+declare 100 generic {
     int TclRenameCommand(Tcl_Interp *interp, char *oldName, char *newName)
 }
-declare 110 generic {
+declare 101 generic {
     void TclResetShadowedCmdRefs(Tcl_Interp *interp, Command *newCmdPtr)
 }
-declare 111 generic {
+declare 102 generic {
     int TclServiceIdle(void)
 }
-declare 112 generic {
+declare 103 generic {
     Tcl_Obj * TclSetElementOfIndexedArray(Tcl_Interp *interp, \
 	    int localIndex, Tcl_Obj *elemPtr, Tcl_Obj *objPtr, int leaveErrorMsg)
 }
-declare 113 generic {
+declare 104 generic {
     Tcl_Obj * TclSetIndexedScalar(Tcl_Interp *interp, int localIndex, \
 	    Tcl_Obj *objPtr, int leaveErrorMsg)
 }
-declare 114 generic {
+declare 105 generic {
     char * TclSetPreInitScript(char *string)
 }
-declare 115 generic {
+declare 106 generic {
     void TclSetupEnv(Tcl_Interp *interp)
 }
-declare 116 generic {
+declare 107 generic {
     int TclSockGetPort(Tcl_Interp *interp, char *string, char *proto, \
 	    int *portPtr)
 }
-declare 117 generic {
+declare 108 generic {
     int TclSockMinimumBuffers(int sock, int size)
 }
-declare 118 generic {
+declare 109 generic {
     int TclStat(CONST char *path, TclStat_ *buf)
 }
-declare 119 generic {
+declare 110 generic {
     int TclStatDeleteProc(TclStatProc_ *proc)
 }
-declare 120 generic {
+declare 111 generic {
     int TclStatInsertProc(TclStatProc_ *proc)
 }
-declare 121 generic {
+declare 112 generic {
     void TclTeardownNamespace(Namespace *nsPtr)
 }
-declare 122 generic {
+declare 113 generic {
     int TclUpdateReturnInfo(Interp *iPtr)
 }
-declare 123 generic {
+declare 114 generic {
     char * TclWordEnd(char *start, char *lastChar, int nested, int *semiPtr)
 }
 
 # Procedures used in conjunction with Tcl namespaces. They are
 # defined here instead of in tcl.decls since they are not stable yet.
 
-declare 124 generic {
+declare 115 generic {
     void Tcl_AddInterpResolvers(Tcl_Interp *interp, char *name, \
 	    Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, \
 	    Tcl_ResolveCompiledVarProc *compiledVarProc)
 }
-declare 125 generic {
+declare 116 generic {
     int Tcl_AppendExportList(Tcl_Interp *interp, Tcl_Namespace *nsPtr, \
 	    Tcl_Obj *objPtr)
 }
-declare 126 generic {
+declare 117 generic {
     Tcl_Namespace * Tcl_CreateNamespace(Tcl_Interp *interp, char *name, \
 	    ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc)
 }
-declare 127 generic {
+declare 118 generic {
     void Tcl_DeleteNamespace(Tcl_Namespace *nsPtr)
 }
-declare 128 generic {
+declare 119 generic {
     int Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr, char *pattern, \
 	    int resetListFirst)
 }
-declare 129 generic {
+declare 120 generic {
     Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, char *name, \
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
-declare 130 generic {
+declare 121 generic {
     Tcl_Namespace * Tcl_FindNamespace(Tcl_Interp *interp, char *name, \
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
-declare 131 generic {
+declare 122 generic {
     int Tcl_GetInterpResolvers(Tcl_Interp *interp, char *name, \
 	    Tcl_ResolverInfo *resInfo)
 }
-declare 132 generic {
+declare 123 generic {
     int Tcl_GetNamespaceResolvers(Tcl_Namespace *namespacePtr, \
 	    Tcl_ResolverInfo *resInfo)
 }
-declare 133 generic {
+declare 124 generic {
     Tcl_Var Tcl_FindNamespaceVar(Tcl_Interp *interp, char *name, \
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
-declare 134 generic {
+declare 125 generic {
     int Tcl_ForgetImport(Tcl_Interp *interp, Tcl_Namespace *nsPtr, \
 	    char *pattern)
 }
-declare 135 generic {
+declare 126 generic {
     Tcl_Command Tcl_GetCommandFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
 }
-declare 136 generic {
+declare 127 generic {
     void Tcl_GetCommandFullName(Tcl_Interp *interp, Tcl_Command command, \
 	    Tcl_Obj *objPtr)
 }
-declare 137 generic {
+declare 128 generic {
     Tcl_Namespace * Tcl_GetCurrentNamespace(Tcl_Interp *interp)
 }
-declare 138 generic {
+declare 129 generic {
     Tcl_Namespace * Tcl_GetGlobalNamespace(Tcl_Interp *interp)
 }
-declare 139 generic {
+declare 130 generic {
     void Tcl_GetVariableFullName(Tcl_Interp *interp, Tcl_Var variable, \
 	    Tcl_Obj *objPtr)
 }
-declare 140 generic {
+declare 131 generic {
     int Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr, \
 	    char *pattern, int allowOverwrite)
 }
-declare 141 generic {
+declare 132 generic {
     void Tcl_PopCallFrame(Tcl_Interp* interp)
 }
-declare 142 generic {
+declare 133 generic {
     int Tcl_PushCallFrame(Tcl_Interp* interp, Tcl_CallFrame *framePtr, \
 	    Tcl_Namespace *nsPtr, int isProcCallFrame)
 } 
-declare 143 generic {
+declare 134 generic {
     int Tcl_RemoveInterpResolvers(Tcl_Interp *interp, char *name)
 }
-declare 144 generic {
+declare 135 generic {
     void Tcl_SetNamespaceResolvers(Tcl_Namespace *namespacePtr, \
 	    Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, \
 	    Tcl_ResolveCompiledVarProc *compiledVarProc)
@@ -528,47 +497,60 @@ declare 144 generic {
 
 # Compilation procedures for commands in the generic core:
 
-declare 145 generic {
+declare 136 generic {
     int	TclCompileBreakCmd(Tcl_Interp *interp, char *string, char *lastChar, \
 	    int compileFlags, struct CompileEnv *compileEnvPtr)
 }
-declare 146 generic {
+declare 137 generic {
     int	TclCompileCatchCmd(Tcl_Interp *interp, char *string, char *lastChar, \
 	    int compileFlags, struct CompileEnv *compileEnvPtr)
 }
-declare 147 generic {
+declare 138 generic {
     int	TclCompileContinueCmd(Tcl_Interp *interp, char *string, \
 	    char *lastChar, int compileFlags, struct CompileEnv *compileEnvPtr)
 }
-declare 148 generic {
+declare 139 generic {
     int	TclCompileExprCmd(Tcl_Interp *interp, char *string, char *lastChar, \
 	    int compileFlags, struct CompileEnv *compileEnvPtr)
 }
-declare 149 generic {
+declare 140 generic {
     int	TclCompileForCmd(Tcl_Interp *interp, char *string, char *lastChar, \
 	    int compileFlags, struct CompileEnv *compileEnvPtr)
 }
-declare 150 generic {
+declare 141 generic {
     int	TclCompileForeachCmd(Tcl_Interp *interp, char *string, \
 	    char *lastChar, int compileFlags, struct CompileEnv *compileEnvPtr)
 }
-declare 151 generic {
+declare 142 generic {
     int	TclCompileIfCmd(Tcl_Interp *interp, char *string, char *lastChar, \
 	    int compileFlags, struct CompileEnv *compileEnvPtr)
 }
-declare 152 generic {
+declare 143 generic {
     int	TclCompileIncrCmd(Tcl_Interp *interp, char *string, char *lastChar, \
 	    int compileFlags, struct CompileEnv *compileEnvPtr)
 }
-declare 153 generic {
+declare 144 generic {
     int	TclCompileSetCmd(Tcl_Interp *interp, char *string, char *lastChar, \
 	    int compileFlags, struct CompileEnv *compileEnvPtr)
 }
-declare 154 generic {
+declare 145 generic {
     int	TclCompileWhileCmd(Tcl_Interp *interp, char *string, char *lastChar, \
 	    int compileFlags, struct CompileEnv *compileEnvPtr)
 }
 
+declare 146 generic {
+    int TclHasSockets(Tcl_Interp *interp)
+}
+declare 147 generic {
+    struct tm *	TclpGetDate(TclpTime_t time, int useGMT)
+}
+declare 148 generic {
+    size_t TclStrftime(char *s, size_t maxsize, const char *format, \
+	    const struct tm *t)
+}
+declare 149 generic {
+    int TclpCheckStackSpace(void)
+}
 
 ##############################################################################
 
@@ -577,24 +559,111 @@ declare 154 generic {
 
 interface tclIntPlat
 
+########################
 # Mac specific internals
 
 declare 0 mac {
-    int TclpCheckStackSpace(void)
+    VOID * TclpSysAlloc(long size, int isBin)
 }
 declare 1 mac {
-    VOID * TclpSysAlloc(long size, int isBin)
+    void TclpSysFree(VOID *ptr)
 }
 declare 2 mac {
-    void TclpSysFree(VOID *ptr)
+    VOID * TclpSysRealloc(VOID *cp, unsigned int size)
 }
 declare 3 mac {
-    VOID * TclpSysRealloc(VOID *cp, unsigned int size)
+    void TclPlatformExit(int status)
 }
+
+# Prototypes for functions found in the tclMacUtil.c compatability library.
+
 declare 4 mac {
-    void TclPlatformExit(int status)
+    int FSpGetDefaultDir(FSSpecPtr theSpec)
+}
+declare 5 mac {
+    int FSpSetDefaultDir(FSSpecPtr theSpec)
+}
+declare 6 mac {
+    OSErr FSpFindFolder(short vRefNum, OSType folderType, \
+	    Boolean createFolder, FSSpec *spec)
+}
+declare 7 mac {
+    void GetGlobalMouse(Point *mouse)
+}
+
+# The following routines are utility functions in Tcl.  They are exported
+# here because they are needed in Tk.  They are not officially supported,
+# however.  The first set are from the MoreFiles package.
+
+declare 8 mac {
+    pascal OSErr FSpGetDirectoryID(const FSSpec *spec, long *theDirID, \
+	    Boolean *isDirectory)
+}
+declare 9 mac {
+    pascal short FSpOpenResFileCompat(const FSSpec *spec, \
+	    SignedByte permission)
+}
+declare 10 mac {
+    pascal void FSpCreateResFileCompat(const FSSpec *spec, OSType creator, \
+	    OSType fileType, ScriptCode scriptTag)
+}
+
+# Like the MoreFiles routines these fix problems in the standard
+# Mac calls.  These routines are from tclMacUtils.h.
+
+declare 11 mac {
+    int FSpLocationFromPath(int length, CONST char *path, FSSpecPtr theSpec)
+}
+declare 12 mac {
+    OSErr FSpPathFromLocation(FSSpecPtr theSpec, int *length, \
+	    Handle *fullPath)
+}
+
+# Prototypes of Mac only internal functions.
+
+declare 13 mac {
+    void TclMacExitHandler(void)
+}
+declare 14 mac {
+    void TclMacInitExitToShell(int usePatch)
+}
+declare 15 mac {
+    OSErr TclMacInstallExitToShellPatch(ExitToShellProcPtr newProc)
+}
+declare 16 mac {
+    int TclMacOSErrorToPosixError(int error)
+}
+declare 17 mac {
+    void TclMacRemoveTimer(void *timerToken)
+}
+declare 18 mac {
+    void * TclMacStartTimer(long ms)
+}
+declare 19 mac {
+    int TclMacTimerExpired(void *timerToken)
+}
+declare 20 mac {
+    int TclMacRegisterResourceFork(short fileRef, Tcl_Obj *tokenPtr, \
+	    int insert)
+}	
+declare 21 mac {
+    short TclMacUnRegisterResourceFork(char *tokenPtr, Tcl_Obj *resultPtr)
+}	
+declare 22 mac {
+    int TclMacCreateEnv(void)
+}
+declare 23 mac {
+    FILE * TclMacFOpenHack(const char *path, const char *mode)
+}
+declare 24 mac {
+    int TclMacReadlink(char *path, char *buf, int size)
+}
+declare 25 mac {
+    int TclMacChmod(char *path, int mode)
 }
 
+
+############################
 # Windows specific internals
 
 declare 0 win {
@@ -615,7 +684,7 @@ declare 4 win {
     HINSTANCE TclWinGetTclInstance(void)
 }
 declare 5 win {
-    HINSTANCE	TclWinLoadLibrary(char *name)
+    HINSTANCE TclWinLoadLibrary(char *name)
 }
 declare 6 win {
     u_short TclWinNToHS(u_short ns)
@@ -624,3 +693,90 @@ declare 7 win {
     int TclWinSetSockOpt(SOCKET s, int level, int optname, \
 	    const char FAR * optval, int optlen)
 }
+declare 8 win {
+    unsigned long TclpGetPid(Tcl_Pid pid)
+}
+declare 9 win {
+    void TclpFinalize(void)
+}
+declare 10 win {
+    int TclWinGetPlatformId(void)
+}
+declare 11 win {
+    void TclWinInit(HINSTANCE hInst)
+}
+declare 12 win {
+    int TclWinSynchSpawn(void *args, int type, void **trans, Tcl_Pid *pidPtr)
+}
+
+# Pipe channel functions
+
+declare 13 win {
+    void TclGetAndDetachPids(Tcl_Interp *interp, Tcl_Channel chan)
+}
+declare 14 win {
+    int TclpCloseFile(TclFile file)
+}
+declare 15 win {
+    Tcl_Channel TclpCreateCommandChannel(TclFile readFile, \
+	    TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr)
+}
+declare 16 win {
+    int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
+}
+declare 17 win {
+    int TclpCreateProcess(Tcl_Interp *interp, int argc, char **argv, \
+	    TclFile inputFile, TclFile outputFile, TclFile errorFile, \
+	    Tcl_Pid *pidPtr)
+}
+declare 18 win {
+    TclFile TclpCreateTempFile(char *contents, 
+    Tcl_DString *namePtr)
+}
+declare 19 win {
+    char * TclpGetTZName(void)
+}
+declare 20 win {
+    TclFile TclpMakeFile(Tcl_Channel channel, int direction)
+}
+declare 21 win {
+    TclFile TclpOpenFile(char *fname, int mode)
+}
+
+#########################
+# Unix specific internals
+
+# Pipe channel functions
+
+declare 0 unix {
+    void TclGetAndDetachPids(Tcl_Interp *interp, Tcl_Channel chan)
+}
+declare 1 unix {
+    int TclpCloseFile(TclFile file)
+}
+declare 2 unix {
+    Tcl_Channel TclpCreateCommandChannel(TclFile readFile, \
+	    TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr)
+}
+declare 3 unix {
+    int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
+}
+declare 4 unix {
+    int TclpCreateProcess(Tcl_Interp *interp, int argc, char **argv, \
+	    TclFile inputFile, TclFile outputFile, TclFile errorFile, \
+	    Tcl_Pid *pidPtr)
+}
+declare 5 unix {
+    TclFile TclpCreateTempFile(char *contents, 
+    Tcl_DString *namePtr)
+}
+declare 6 unix {
+    TclFile TclpMakeFile(Tcl_Channel channel, int direction)
+}
+declare 7 unix {
+    TclFile TclpOpenFile(char *fname, int mode)
+}
+declare 8 unix {
+    int TclUnixWaitForFile(int fd, int mask, int timeout)
+}
+