diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | generic/tclInt.decls | 532 | ||||
| -rw-r--r-- | generic/tclIntDecls.h | 779 | ||||
| -rw-r--r-- | generic/tclIntPlatDecls.h | 48 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 14 | ||||
| -rw-r--r-- | tools/genStubs.tcl | 16 |
6 files changed, 702 insertions, 700 deletions
@@ -1,3 +1,16 @@ +2012-04-03 Jan Nijtmans <nijtmans@users.sf.net> + + * tools/genStubs.tcl: Let genStubs.tcl do the void -> VOID and + const -> CONST translations, so we cannot forget it in the *.decls file + * generic/tclInt.decls: VOID -> void and CONST -> const, so depend + on genStubs.tcl to generate the correct form in the *Decls.h file. + This brings tclInt.decls in the same form as Tcl 8.5/8.6, so a diff + can show us the real signature differences. + (Backported from Tcl 8.5, no change in any function signature) + * generic/tclStubInit.c Remove the TclpGetTZName implementation for + * generic/tclIntDecls.h: Cygwin (from previous commit) , re-generated + * generic/tclIntPlatDecls.h: + 2012-03-30 Jan Nijtmans <nijtmans@users.sf.net> * generic/tclInt.decls: [Bug 3508771] load tclreg.dll in cygwin tclsh diff --git a/generic/tclInt.decls b/generic/tclInt.decls index b5fd668..43947df 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -24,33 +24,33 @@ interface tclInt # be changed between versions to avoid gratuitous incompatibilities. # Replaced by Tcl_FSAccess in 8.4: -#declare 0 generic { -# int TclAccess(CONST char *path, int mode) +#declare 0 { +# int TclAccess(const char *path, int mode) #} -declare 1 generic { +declare 1 { int TclAccessDeleteProc(TclAccessProc_ *proc) } -declare 2 generic { +declare 2 { int TclAccessInsertProc(TclAccessProc_ *proc) } -declare 3 generic { +declare 3 { void TclAllocateFreeObjects(void) } # Replaced by TclpChdir in 8.1: -# declare 4 generic { +# declare 4 { # int TclChdir(Tcl_Interp *interp, char *dirName) # } declare 5 {unix win} { int TclCleanupChildren(Tcl_Interp *interp, int numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan) } -declare 6 generic { +declare 6 { void TclCleanupCommand(Command *cmdPtr) } -declare 7 generic { - int TclCopyAndCollapse(int count, CONST char *src, char *dst) +declare 7 { + int TclCopyAndCollapse(int count, const char *src, char *dst) } -declare 8 generic { +declare 8 { int TclCopyChannel(Tcl_Interp *interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr) } @@ -58,351 +58,352 @@ declare 8 generic { # TclCreatePipeline unofficially exported for use by BLT. declare 9 {unix win} { - int TclCreatePipeline(Tcl_Interp *interp, int argc, CONST char **argv, + int TclCreatePipeline(Tcl_Interp *interp, int argc, const char **argv, Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr, TclFile *errFilePtr) } -declare 10 generic { +declare 10 { int TclCreateProc(Tcl_Interp *interp, Namespace *nsPtr, - CONST char *procName, + const char *procName, Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Proc **procPtrPtr) } -declare 11 generic { +declare 11 { void TclDeleteCompiledLocalVars(Interp *iPtr, CallFrame *framePtr) } -declare 12 generic { +declare 12 { void TclDeleteVars(Interp *iPtr, Tcl_HashTable *tablePtr) } -declare 13 generic { +declare 13 { int TclDoGlob(Tcl_Interp *interp, char *separators, Tcl_DString *headPtr, char *tail, Tcl_GlobTypeData *types) } -declare 14 generic { +declare 14 { void TclDumpMemoryInfo(FILE *outFile) } # Removed in 8.1: -# declare 15 generic { +# declare 15 { # void TclExpandParseValue(ParseValue *pvPtr, int needed) # } -declare 16 generic { +declare 16 { void TclExprFloatError(Tcl_Interp *interp, double value) } # Removed in 8.4 -#declare 17 generic { -# int TclFileAttrsCmd(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +#declare 17 { +# int TclFileAttrsCmd(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) #} -#declare 18 generic { +#declare 18 { # int TclFileCopyCmd(Tcl_Interp *interp, int argc, char **argv) #} -#declare 19 generic { +#declare 19 { # int TclFileDeleteCmd(Tcl_Interp *interp, int argc, char **argv) #} -#declare 20 generic { +#declare 20 { # int TclFileMakeDirsCmd(Tcl_Interp *interp, int argc, char **argv) #} -#declare 21 generic { +#declare 21 { # int TclFileRenameCmd(Tcl_Interp *interp, int argc, char **argv) #} -declare 22 generic { - int TclFindElement(Tcl_Interp *interp, CONST char *listStr, - int listLength, CONST char **elementPtr, CONST char **nextPtr, +declare 22 { + int TclFindElement(Tcl_Interp *interp, const char *listStr, + int listLength, const char **elementPtr, const char **nextPtr, int *sizePtr, int *bracePtr) } -declare 23 generic { - Proc *TclFindProc(Interp *iPtr, CONST char *procName) +declare 23 { + Proc *TclFindProc(Interp *iPtr, const char *procName) } -declare 24 generic { +declare 24 { int TclFormatInt(char *buffer, long n) } -declare 25 generic { +declare 25 { void TclFreePackageInfo(Interp *iPtr) } # Removed in 8.1: -# declare 26 generic { +# declare 26 { # char *TclGetCwd(Tcl_Interp *interp) # } -declare 27 generic { +declare 27 { int TclGetDate(char *p, Tcl_WideInt now, long zone, Tcl_WideInt *timePtr) } -declare 28 generic { +declare 28 { Tcl_Channel TclpGetDefaultStdChannel(int type) } # Removed in 8.4b2: -#declare 29 generic { +#declare 29 { # Tcl_Obj *TclGetElementOfIndexedArray(Tcl_Interp *interp, # int localIndex, Tcl_Obj *elemPtr, int flags) #} -# Replaced by char *TclGetEnv(CONST char *name, Tcl_DString *valuePtr) in 8.1: -# declare 30 generic { -# char *TclGetEnv(CONST char *name) +# Replaced by char *TclGetEnv(const char *name, Tcl_DString *valuePtr) in 8.1: +# declare 30 { +# char *TclGetEnv(const char *name) # } -declare 31 generic { +declare 31 { char *TclGetExtension(char *name) } -declare 32 generic { - int TclGetFrame(Tcl_Interp *interp, CONST char *str, +declare 32 { + int TclGetFrame(Tcl_Interp *interp, const char *str, CallFrame **framePtrPtr) } -declare 33 generic { +declare 33 { TclCmdProcType TclGetInterpProc(void) } -declare 34 generic { +declare 34 { int TclGetIntForIndex(Tcl_Interp *interp, Tcl_Obj *objPtr, int endValue, int *indexPtr) } # Removed in 8.4b2: -#declare 35 generic { +#declare 35 { # Tcl_Obj *TclGetIndexedScalar(Tcl_Interp *interp, int localIndex, # int flags) #} -declare 36 generic { - int TclGetLong(Tcl_Interp *interp, CONST char *str, long *longPtr) +declare 36 { + int TclGetLong(Tcl_Interp *interp, const char *str, long *longPtr) } -declare 37 generic { +declare 37 { int TclGetLoadedPackages(Tcl_Interp *interp, char *targetName) } -declare 38 generic { - int TclGetNamespaceForQualName(Tcl_Interp *interp, CONST char *qualName, +declare 38 { + int TclGetNamespaceForQualName(Tcl_Interp *interp, const char *qualName, Namespace *cxtNsPtr, int flags, Namespace **nsPtrPtr, Namespace **altNsPtrPtr, Namespace **actualCxtPtrPtr, - CONST char **simpleNamePtr) + const char **simpleNamePtr) } -declare 39 generic { +declare 39 { TclObjCmdProcType TclGetObjInterpProc(void) } -declare 40 generic { - int TclGetOpenMode(Tcl_Interp *interp, CONST char *str, int *seekFlagPtr) +declare 40 { + int TclGetOpenMode(Tcl_Interp *interp, const char *str, int *seekFlagPtr) } -declare 41 generic { +declare 41 { Tcl_Command TclGetOriginalCommand(Tcl_Command command) } -declare 42 generic { - char *TclpGetUserHome(CONST char *name, Tcl_DString *bufferPtr) +declare 42 { + char *TclpGetUserHome(const char *name, Tcl_DString *bufferPtr) } -declare 43 generic { +declare 43 { int TclGlobalInvoke(Tcl_Interp *interp, int argc, CONST84 char **argv, int flags) } -declare 44 generic { - int TclGuessPackageName(CONST char *fileName, Tcl_DString *bufPtr) +declare 44 { + int TclGuessPackageName(const char *fileName, Tcl_DString *bufPtr) } -declare 45 generic { +declare 45 { int TclHideUnsafeCommands(Tcl_Interp *interp) } -declare 46 generic { +declare 46 { int TclInExit(void) } # Removed in 8.4b2: -#declare 47 generic { +#declare 47 { # Tcl_Obj *TclIncrElementOfIndexedArray(Tcl_Interp *interp, # int localIndex, Tcl_Obj *elemPtr, long incrAmount) #} # Removed in 8.4b2: -#declare 48 generic { +#declare 48 { # Tcl_Obj *TclIncrIndexedScalar(Tcl_Interp *interp, int localIndex, # long incrAmount) #} -declare 49 generic { +declare 49 { Tcl_Obj *TclIncrVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, long incrAmount, int part1NotParsed) } -declare 50 generic { +declare 50 { void TclInitCompiledLocals(Tcl_Interp *interp, CallFrame *framePtr, Namespace *nsPtr) } -declare 51 generic { +declare 51 { int TclInterpInit(Tcl_Interp *interp) } -declare 52 generic { +declare 52 { int TclInvoke(Tcl_Interp *interp, int argc, CONST84 char **argv, int flags) } -declare 53 generic { +declare 53 { int TclInvokeObjectCommand(ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char **argv) } -declare 54 generic { +declare 54 { int TclInvokeStringCommand(ClientData clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) } -declare 55 generic { +declare 55 { Proc *TclIsProc(Command *cmdPtr) } # Replaced with TclpLoadFile in 8.1: -# declare 56 generic { +# declare 56 { # int TclLoadFile(Tcl_Interp *interp, char *fileName, char *sym1, # char *sym2, Tcl_PackageInitProc **proc1Ptr, # Tcl_PackageInitProc **proc2Ptr) # } # Signature changed to take a length in 8.1: -# declare 57 generic { +# declare 57 { # int TclLooksLikeInt(char *p) # } -declare 58 generic { - Var *TclLookupVar(Tcl_Interp *interp, CONST char *part1, CONST char *part2, - int flags, CONST char *msg, int createPart1, int createPart2, +declare 58 { + Var *TclLookupVar(Tcl_Interp *interp, const char *part1, const char *part2, + int flags, const char *msg, int createPart1, int createPart2, Var **arrayPtrPtr) } # Replaced by Tcl_FSMatchInDirectory in 8.4 -#declare 59 generic { +#declare 59 { # int TclpMatchFiles(Tcl_Interp *interp, char *separators, # Tcl_DString *dirPtr, char *pattern, char *tail) #} -declare 60 generic { - int TclNeedSpace(CONST char *start, CONST char *end) +declare 60 { + int TclNeedSpace(const char *start, const char *end) } -declare 61 generic { +declare 61 { Tcl_Obj *TclNewProcBodyObj(Proc *procPtr) } -declare 62 generic { +declare 62 { int TclObjCommandComplete(Tcl_Obj *cmdPtr) } -declare 63 generic { +declare 63 { int TclObjInterpProc(ClientData clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) } -declare 64 generic { - int TclObjInvoke(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +declare 64 { + int TclObjInvoke(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], int flags) } -declare 65 generic { +declare 65 { int TclObjInvokeGlobal(Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[], int flags) + Tcl_Obj *const objv[], int flags) } -declare 66 generic { +declare 66 { int TclOpenFileChannelDeleteProc(TclOpenFileChannelProc_ *proc) } -declare 67 generic { +declare 67 { int TclOpenFileChannelInsertProc(TclOpenFileChannelProc_ *proc) } # Replaced by Tcl_FSAccess in 8.4: -#declare 68 generic { -# int TclpAccess(CONST char *path, int mode) +#declare 68 { +# int TclpAccess(const char *path, int mode) #} -declare 69 generic { +declare 69 { char *TclpAlloc(unsigned int size) } -#declare 70 generic { -# int TclpCopyFile(CONST char *source, CONST char *dest) +#declare 70 { +# int TclpCopyFile(const char *source, const char *dest) #} -#declare 71 generic { -# int TclpCopyDirectory(CONST char *source, CONST char *dest, +#declare 71 { +# int TclpCopyDirectory(const char *source, const char *dest, # Tcl_DString *errorPtr) #} -#declare 72 generic { -# int TclpCreateDirectory(CONST char *path) +#declare 72 { +# int TclpCreateDirectory(const char *path) #} -#declare 73 generic { -# int TclpDeleteFile(CONST char *path) +#declare 73 { +# int TclpDeleteFile(const char *path) #} -declare 74 generic { +declare 74 { void TclpFree(char *ptr) } -declare 75 generic { +declare 75 { unsigned long TclpGetClicks(void) } -declare 76 generic { +declare 76 { unsigned long TclpGetSeconds(void) } # deprecated -declare 77 generic { +declare 77 { void TclpGetTime(Tcl_Time *time) } -declare 78 generic { +declare 78 { int TclpGetTimeZone(Tcl_WideInt time) } # Replaced by Tcl_FSListVolumes in 8.4: -#declare 79 generic { +#declare 79 { # int TclpListVolumes(Tcl_Interp *interp) #} # Replaced by Tcl_FSOpenFileChannel in 8.4: -#declare 80 generic { +#declare 80 { # Tcl_Channel TclpOpenFileChannel(Tcl_Interp *interp, char *fileName, # char *modeString, int permissions) #} -declare 81 generic { +declare 81 { char *TclpRealloc(char *ptr, unsigned int size) } -#declare 82 generic { -# int TclpRemoveDirectory(CONST char *path, int recursive, +#declare 82 { +# int TclpRemoveDirectory(const char *path, int recursive, # Tcl_DString *errorPtr) #} -#declare 83 generic { -# int TclpRenameFile(CONST char *source, CONST char *dest) +#declare 83 { +# int TclpRenameFile(const char *source, const char *dest) #} # Removed in 8.1: -# declare 84 generic { +# declare 84 { # int TclParseBraces(Tcl_Interp *interp, char *str, char **termPtr, # ParseValue *pvPtr) # } -# declare 85 generic { +# declare 85 { # int TclParseNestedCmd(Tcl_Interp *interp, char *str, int flags, # char **termPtr, ParseValue *pvPtr) # } -# declare 86 generic { +# declare 86 { # int TclParseQuotes(Tcl_Interp *interp, char *str, int termChar, # int flags, char **termPtr, ParseValue *pvPtr) # } -# declare 87 generic { +# declare 87 { # void TclPlatformInit(Tcl_Interp *interp) # } -declare 88 generic { +declare 88 { char *TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp, - CONST char *name1, CONST char *name2, int flags) + const char *name1, const char *name2, int flags) } -declare 89 generic { +declare 89 { int TclPreventAliasLoop(Tcl_Interp *interp, Tcl_Interp *cmdInterp, Tcl_Command cmd) } # Removed in 8.1 (only available if compiled with TCL_COMPILE_DEBUG): -# declare 90 generic { +# declare 90 { # void TclPrintByteCodeObj(Tcl_Interp *interp, Tcl_Obj *objPtr) # } -declare 91 generic { +declare 91 { void TclProcCleanupProc(Proc *procPtr) } -declare 92 generic { +declare 92 { int TclProcCompileProc(Tcl_Interp *interp, Proc *procPtr, - Tcl_Obj *bodyPtr, Namespace *nsPtr, CONST char *description, - CONST char *procName) + Tcl_Obj *bodyPtr, Namespace *nsPtr, const char *description, + const char *procName) } -declare 93 generic { +declare 93 { void TclProcDeleteProc(ClientData clientData) } -declare 94 generic { +declare 94 { int TclProcInterpProc(ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char **argv) } # Replaced by Tcl_FSStat in 8.4: -#declare 95 generic { -# int TclpStat(CONST char *path, Tcl_StatBuf *buf) +#declare 95 { +# int TclpStat(const char *path, Tcl_StatBuf *buf) #} -declare 96 generic { - int TclRenameCommand(Tcl_Interp *interp, char *oldName, char *newName) +declare 96 { + int TclRenameCommand(Tcl_Interp *interp, char *oldName, + char *newName) } -declare 97 generic { +declare 97 { void TclResetShadowedCmdRefs(Tcl_Interp *interp, Command *newCmdPtr) } -declare 98 generic { +declare 98 { int TclServiceIdle(void) } # Removed in 8.4b2: -#declare 99 generic { +#declare 99 { # Tcl_Obj *TclSetElementOfIndexedArray(Tcl_Interp *interp, int localIndex, # Tcl_Obj *elemPtr, Tcl_Obj *objPtr, int flags) #} # Removed in 8.4b2: -#declare 100 generic { +#declare 100 { # Tcl_Obj *TclSetIndexedScalar(Tcl_Interp *interp, int localIndex, # Tcl_Obj *objPtr, int flags) #} -declare 101 generic { +declare 101 { char *TclSetPreInitScript(char *string) } -declare 102 generic { +declare 102 { void TclSetupEnv(Tcl_Interp *interp) } -declare 103 generic { +declare 103 { int TclSockGetPort(Tcl_Interp *interp, char *str, char *proto, int *portPtr) } @@ -410,296 +411,296 @@ declare 104 {unix win} { int TclSockMinimumBuffers(int sock, int size) } # Replaced by Tcl_FSStat in 8.4: -#declare 105 generic { -# int TclStat(CONST char *path, Tcl_StatBuf *buf) +#declare 105 { +# int TclStat(const char *path, Tcl_StatBuf *buf) #} -declare 106 generic { +declare 106 { int TclStatDeleteProc(TclStatProc_ *proc) } -declare 107 generic { +declare 107 { int TclStatInsertProc(TclStatProc_ *proc) } -declare 108 generic { +declare 108 { void TclTeardownNamespace(Namespace *nsPtr) } -declare 109 generic { +declare 109 { int TclUpdateReturnInfo(Interp *iPtr) } # Removed in 8.1: -# declare 110 generic { +# declare 110 { # 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 111 generic { - void Tcl_AddInterpResolvers(Tcl_Interp *interp, CONST char *name, +declare 111 { + void Tcl_AddInterpResolvers(Tcl_Interp *interp, const char *name, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc) } -declare 112 generic { +declare 112 { int Tcl_AppendExportList(Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *objPtr) } -declare 113 generic { - Tcl_Namespace *Tcl_CreateNamespace(Tcl_Interp *interp, CONST char *name, +declare 113 { + Tcl_Namespace *Tcl_CreateNamespace(Tcl_Interp *interp, const char *name, ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc) } -declare 114 generic { +declare 114 { void Tcl_DeleteNamespace(Tcl_Namespace *nsPtr) } -declare 115 generic { +declare 115 { int Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr, - CONST char *pattern, int resetListFirst) + const char *pattern, int resetListFirst) } -declare 116 generic { - Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, CONST char *name, +declare 116 { + Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags) } -declare 117 generic { - Tcl_Namespace *Tcl_FindNamespace(Tcl_Interp *interp, CONST char *name, +declare 117 { + Tcl_Namespace *Tcl_FindNamespace(Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags) } -declare 118 generic { - int Tcl_GetInterpResolvers(Tcl_Interp *interp, CONST char *name, +declare 118 { + int Tcl_GetInterpResolvers(Tcl_Interp *interp, const char *name, Tcl_ResolverInfo *resInfo) } -declare 119 generic { +declare 119 { int Tcl_GetNamespaceResolvers(Tcl_Namespace *namespacePtr, Tcl_ResolverInfo *resInfo) } -declare 120 generic { - Tcl_Var Tcl_FindNamespaceVar(Tcl_Interp *interp, CONST char *name, +declare 120 { + Tcl_Var Tcl_FindNamespaceVar(Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags) } -declare 121 generic { +declare 121 { int Tcl_ForgetImport(Tcl_Interp *interp, Tcl_Namespace *nsPtr, - CONST char *pattern) + const char *pattern) } -declare 122 generic { +declare 122 { Tcl_Command Tcl_GetCommandFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr) } -declare 123 generic { +declare 123 { void Tcl_GetCommandFullName(Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr) } -declare 124 generic { +declare 124 { Tcl_Namespace *Tcl_GetCurrentNamespace(Tcl_Interp *interp) } -declare 125 generic { +declare 125 { Tcl_Namespace *Tcl_GetGlobalNamespace(Tcl_Interp *interp) } -declare 126 generic { +declare 126 { void Tcl_GetVariableFullName(Tcl_Interp *interp, Tcl_Var variable, Tcl_Obj *objPtr) } -declare 127 generic { +declare 127 { int Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr, - CONST char *pattern, int allowOverwrite) + const char *pattern, int allowOverwrite) } -declare 128 generic { +declare 128 { void Tcl_PopCallFrame(Tcl_Interp *interp) } -declare 129 generic { +declare 129 { int Tcl_PushCallFrame(Tcl_Interp *interp, Tcl_CallFrame *framePtr, Tcl_Namespace *nsPtr, int isProcCallFrame) } -declare 130 generic { - int Tcl_RemoveInterpResolvers(Tcl_Interp *interp, CONST char *name) +declare 130 { + int Tcl_RemoveInterpResolvers(Tcl_Interp *interp, const char *name) } -declare 131 generic { +declare 131 { void Tcl_SetNamespaceResolvers(Tcl_Namespace *namespacePtr, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc) } -declare 132 generic { +declare 132 { int TclpHasSockets(Tcl_Interp *interp) } -declare 133 generic { +declare 133 { struct tm *TclpGetDate(TclpTime_t time, int useGMT) } -declare 134 generic { - size_t TclpStrftime(char *s, size_t maxsize, CONST char *format, - CONST struct tm *t, int useGMT) +declare 134 { + size_t TclpStrftime(char *s, size_t maxsize, const char *format, + const struct tm *t, int useGMT) } -declare 135 generic { +declare 135 { int TclpCheckStackSpace(void) } # Added in 8.1: -#declare 137 generic { -# int TclpChdir(CONST char *dirName) +#declare 137 { +# int TclpChdir(const char *dirName) #} -declare 138 generic { - CONST84_RETURN char *TclGetEnv(CONST char *name, Tcl_DString *valuePtr) +declare 138 { + CONST84_RETURN char *TclGetEnv(const char *name, Tcl_DString *valuePtr) } -#declare 139 generic { +#declare 139 { # int TclpLoadFile(Tcl_Interp *interp, char *fileName, char *sym1, # char *sym2, Tcl_PackageInitProc **proc1Ptr, # Tcl_PackageInitProc **proc2Ptr, ClientData *clientDataPtr) #} -declare 140 generic { - int TclLooksLikeInt(CONST char *bytes, int length) +declare 140 { + int TclLooksLikeInt(const char *bytes, int length) } # This is used by TclX, but should otherwise be considered private -declare 141 generic { +declare 141 { CONST84_RETURN char *TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr) } -declare 142 generic { +declare 142 { int TclSetByteCodeFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr, CompileHookProc *hookProc, ClientData clientData) } -declare 143 generic { +declare 143 { int TclAddLiteralObj(struct CompileEnv *envPtr, Tcl_Obj *objPtr, LiteralEntry **litPtrPtr) } -declare 144 generic { +declare 144 { void TclHideLiteral(Tcl_Interp *interp, struct CompileEnv *envPtr, int index) } -declare 145 generic { +declare 145 { struct AuxDataType *TclGetAuxDataType(char *typeName) } -declare 146 generic { - TclHandle TclHandleCreate(VOID *ptr) +declare 146 { + TclHandle TclHandleCreate(void *ptr) } -declare 147 generic { +declare 147 { void TclHandleFree(TclHandle handle) } -declare 148 generic { +declare 148 { TclHandle TclHandlePreserve(TclHandle handle) } -declare 149 generic { +declare 149 { void TclHandleRelease(TclHandle handle) } # Added for Tcl 8.2 -declare 150 generic { +declare 150 { int TclRegAbout(Tcl_Interp *interp, Tcl_RegExp re) } -declare 151 generic { +declare 151 { void TclRegExpRangeUniChar(Tcl_RegExp re, int index, int *startPtr, int *endPtr) } -declare 152 generic { +declare 152 { void TclSetLibraryPath(Tcl_Obj *pathPtr) } -declare 153 generic { +declare 153 { Tcl_Obj *TclGetLibraryPath(void) } # moved to tclTest.c (static) in 8.3.2/8.4a2 -#declare 154 generic { +#declare 154 { # int TclTestChannelCmd(ClientData clientData, # Tcl_Interp *interp, int argc, char **argv) #} -#declare 155 generic { +#declare 155 { # int TclTestChannelEventCmd(ClientData clientData, # Tcl_Interp *interp, int argc, char **argv) #} -declare 156 generic { - void TclRegError(Tcl_Interp *interp, CONST char *msg, +declare 156 { + void TclRegError(Tcl_Interp *interp, const char *msg, int status) } -declare 157 generic { - Var *TclVarTraceExists(Tcl_Interp *interp, CONST char *varName) +declare 157 { + Var *TclVarTraceExists(Tcl_Interp *interp, const char *varName) } -declare 158 generic { - void TclSetStartupScriptFileName(CONST char *filename) +declare 158 { + void TclSetStartupScriptFileName(const char *filename) } -declare 159 generic { +declare 159 { CONST84_RETURN char *TclGetStartupScriptFileName(void) } -#declare 160 generic { +#declare 160 { # int TclpMatchFilesTypes(Tcl_Interp *interp, char *separators, # Tcl_DString *dirPtr, char *pattern, char *tail, # GlobTypeData *types) #} # new in 8.3.2/8.4a2 -declare 161 generic { +declare 161 { int TclChannelTransform(Tcl_Interp *interp, Tcl_Channel chan, Tcl_Obj *cmdObjPtr) } -declare 162 generic { +declare 162 { void TclChannelEventScriptInvoker(ClientData clientData, int flags) } # ALERT: The result of 'TclGetInstructionTable' is actually a -# "InstructionDesc*" but we do not want to describe this structure in +# "const InstructionDesc*" but we do not want to describe this structure in # "tclInt.h". It is described in "tclCompile.h". Use a cast to the # correct type when calling this procedure. -declare 163 generic { - VOID *TclGetInstructionTable(void) +declare 163 { + void *TclGetInstructionTable(void) } # ALERT: The argument of 'TclExpandCodeArray' is actually a # "CompileEnv*" but we do not want to describe this structure in # "tclInt.h". It is described in "tclCompile.h". -declare 164 generic { - void TclExpandCodeArray(VOID *envPtr) +declare 164 { + void TclExpandCodeArray(void *envPtr) } # These functions are vfs aware, but are generally only useful internally. -declare 165 generic { +declare 165 { void TclpSetInitialEncodings(void) } # New function due to TIP #33 -declare 166 generic { +declare 166 { int TclListObjSetElement(Tcl_Interp *interp, Tcl_Obj *listPtr, int index, Tcl_Obj *valuePtr) } # VFS-aware versions of Tcl*StartupScriptFileName (158 and 159 above) -declare 167 generic { +declare 167 { void TclSetStartupScriptPath(Tcl_Obj *pathPtr) } -declare 168 generic { +declare 168 { Tcl_Obj *TclGetStartupScriptPath(void) } # variant of Tcl_UtfNCmp that takes n as bytes, not chars -declare 169 generic { - int TclpUtfNcmp2(CONST char *s1, CONST char *s2, unsigned long n) +declare 169 { + int TclpUtfNcmp2(const char *s1, const char *s2, unsigned long n) } -declare 170 generic { - int TclCheckInterpTraces(Tcl_Interp *interp, CONST char *command, +declare 170 { + int TclCheckInterpTraces(Tcl_Interp *interp, const char *command, int numChars, Command *cmdPtr, int result, int traceFlags, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) } -declare 171 generic { - int TclCheckExecutionTraces (Tcl_Interp *interp, CONST char *command, +declare 171 { + int TclCheckExecutionTraces(Tcl_Interp *interp, const char *command, int numChars, Command *cmdPtr, int result, int traceFlags, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) } -declare 172 generic { +declare 172 { int TclInThreadExit(void) } # added for 8.4.2 -declare 173 generic { - int TclUniCharMatch(CONST Tcl_UniChar *string, int strLen, \ - CONST Tcl_UniChar *pattern, int ptnLen, int nocase) +declare 173 { + int TclUniCharMatch(const Tcl_UniChar *string, int strLen, + const Tcl_UniChar *pattern, int ptnLen, int nocase) } # TclpGmtime and TclpLocaltime promoted to the generic interface from unix -declare 182 generic { +declare 182 { struct tm *TclpLocaltime(TclpTime_t_CONST clock) } -declare 183 generic { +declare 183 { struct tm *TclpGmtime(TclpTime_t_CONST clock) } -declare 199 generic { - int TclMatchIsTrivial(CONST char *pattern) +declare 199 { + int TclMatchIsTrivial(const char *pattern) } ############################################################################## @@ -713,13 +714,13 @@ interface tclIntPlat # Mac specific internals declare 0 mac { - VOID *TclpSysAlloc(long size, int isBin) + void *TclpSysAlloc(long size, int isBin) } declare 1 mac { - void TclpSysFree(VOID *ptr) + void TclpSysFree(void *ptr) } declare 2 mac { - VOID *TclpSysRealloc(VOID *cp, unsigned int size) + void *TclpSysRealloc(void *cp, unsigned int size) } declare 3 mac { void TclpExit(int status) @@ -746,15 +747,15 @@ declare 7 mac { # however. The first set are from the MoreFiles package. declare 8 mac { - pascal OSErr FSpGetDirectoryIDTcl(CONST FSSpec *spec, long *theDirID, + pascal OSErr FSpGetDirectoryIDTcl(const FSSpec *spec, long *theDirID, Boolean *isDirectory) } declare 9 mac { - pascal short FSpOpenResFileCompatTcl(CONST FSSpec *spec, + pascal short FSpOpenResFileCompatTcl(const FSSpec *spec, SignedByte permission) } declare 10 mac { - pascal void FSpCreateResFileCompatTcl(CONST FSSpec *spec, OSType creator, + pascal void FSpCreateResFileCompatTcl(const FSSpec *spec, OSType creator, OSType fileType, ScriptCode scriptTag) } @@ -762,7 +763,7 @@ declare 10 mac { # Mac calls. These routines are from tclMacUtils.h. declare 11 mac { - int FSpLocationFromPath(int length, CONST char *path, FSSpecPtr theSpec) + int FSpLocationFromPath(int length, const char *path, FSSpecPtr theSpec) } declare 12 mac { OSErr FSpPathFromLocation(FSSpecPtr theSpec, int *length, @@ -784,13 +785,13 @@ declare 16 mac { int TclMacOSErrorToPosixError(int error) } declare 17 mac { - void TclMacRemoveTimer(VOID *timerToken) + void TclMacRemoveTimer(void *timerToken) } declare 18 mac { - VOID *TclMacStartTimer(long ms) + void *TclMacStartTimer(long ms) } declare 19 mac { - int TclMacTimerExpired(VOID *timerToken) + int TclMacTimerExpired(void *timerToken) } declare 20 mac { int TclMacRegisterResourceFork(short fileRef, Tcl_Obj *tokenPtr, @@ -803,7 +804,7 @@ declare 22 mac { int TclMacCreateEnv(void) } declare 23 mac { - FILE *TclMacFOpenHack(CONST char *path, CONST char *mode) + FILE *TclMacFOpenHack(const char *path, const char *mode) } # Replaced in 8.1 by TclpReadLink: # declare 24 mac { @@ -813,11 +814,11 @@ declare 24 mac { char *TclpGetTZName(int isdst) } declare 25 mac { - int TclMacChmod(CONST char *path, int mode) + int TclMacChmod(const char *path, int mode) } # version of FSpLocationFromPath that doesn't resolve the last path component declare 26 mac { - int FSpLLocationFromPath(int length, CONST char *path, FSSpecPtr theSpec) + int FSpLLocationFromPath(int length, const char *path, FSSpecPtr theSpec) } ################################ @@ -830,8 +831,8 @@ declare 1 win { void TclWinConvertWSAError(DWORD errCode) } declare 2 win { - struct servent *TclWinGetServByName(CONST char *nm, - CONST char *proto) + struct servent *TclWinGetServByName(const char *nm, + const char *proto) } declare 3 win { int TclWinGetSockOpt(SOCKET s, int level, int optname, @@ -849,7 +850,7 @@ declare 6 win { } declare 7 win { int TclWinSetSockOpt(SOCKET s, int level, int optname, - CONST char *optval, int optlen) + const char *optval, int optlen) } declare 8 win { unsigned long TclpGetPid(Tcl_Pid pid) @@ -878,7 +879,7 @@ declare 14 win { int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe) } declare 15 win { - int TclpCreateProcess(Tcl_Interp *interp, int argc, CONST char **argv, + int TclpCreateProcess(Tcl_Interp *interp, int argc, const char **argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr) } @@ -893,7 +894,7 @@ declare 18 win { TclFile TclpMakeFile(Tcl_Channel channel, int direction) } declare 19 win { - TclFile TclpOpenFile(CONST char *fname, int mode) + TclFile TclpOpenFile(const char *fname, int mode) } declare 20 win { void TclWinAddProcess(HANDLE hProcess, DWORD id) @@ -906,7 +907,7 @@ declare 20 win { # Added in 8.1: declare 22 win { - TclFile TclpCreateTempFile(CONST char *contents) + TclFile TclpCreateTempFile(const char *contents) } declare 23 win { char *TclpGetTZName(int isdst) @@ -972,7 +973,7 @@ declare 6 unix { # On non-cygwin, this is actually a reference to TclpOpenFile declare 7 unix { int TclWinSetSockOpt(void *s, int level, int optname, - CONST char *optval, int optlen) + const char *optval, int optlen) } declare 8 unix { int TclUnixWaitForFile(int fd, int mask, int timeout) @@ -1010,22 +1011,19 @@ declare 15 unix { } #On cygwin, TclpMakeFile is here declare 18 unix { - int TclMacOSXMatchType(Tcl_Interp *interp, CONST char *pathName, - CONST char *fileName, Tcl_StatBuf *statBufPtr, + int TclMacOSXMatchType(Tcl_Interp *interp, const char *pathName, + const char *fileName, Tcl_StatBuf *statBufPtr, Tcl_GlobTypeData *types) } #On cygwin, TclpOpenFile is here declare 19 unix { - void TclMacOSXNotifierAddRunLoopMode(CONST void *runLoopMode) + void TclMacOSXNotifierAddRunLoopMode(const void *runLoopMode) } declare 20 unix { void TclWinAddProcess(void *hProcess, unsigned int id) } declare 22 unix { - TclFile TclpCreateTempFile(CONST char *contents) -} -declare 23 unix { - char *TclpGetTZName(int isdst) + TclFile TclpCreateTempFile(const char *contents) } declare 24 unix { char *TclWinNoBackslash(char *path) diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 1d831ed..bf0c2b7 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -30,68 +30,68 @@ /* Slot 0 is reserved */ /* 1 */ EXTERN int TclAccessDeleteProc _ANSI_ARGS_(( - TclAccessProc_ * proc)); + TclAccessProc_ *proc)); /* 2 */ EXTERN int TclAccessInsertProc _ANSI_ARGS_(( - TclAccessProc_ * proc)); + TclAccessProc_ *proc)); /* 3 */ EXTERN void TclAllocateFreeObjects _ANSI_ARGS_((void)); /* Slot 4 is reserved */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ /* 5 */ -EXTERN int TclCleanupChildren _ANSI_ARGS_((Tcl_Interp * interp, - int numPids, Tcl_Pid * pidPtr, +EXTERN int TclCleanupChildren _ANSI_ARGS_((Tcl_Interp *interp, + int numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan)); #endif /* UNIX */ #ifdef __WIN32__ /* 5 */ -EXTERN int TclCleanupChildren _ANSI_ARGS_((Tcl_Interp * interp, - int numPids, Tcl_Pid * pidPtr, +EXTERN int TclCleanupChildren _ANSI_ARGS_((Tcl_Interp *interp, + int numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan)); #endif /* __WIN32__ */ /* 6 */ -EXTERN void TclCleanupCommand _ANSI_ARGS_((Command * cmdPtr)); +EXTERN void TclCleanupCommand _ANSI_ARGS_((Command *cmdPtr)); /* 7 */ -EXTERN int TclCopyAndCollapse _ANSI_ARGS_((int count, - CONST char * src, char * dst)); +EXTERN int TclCopyAndCollapse _ANSI_ARGS_((int count, + CONST char *src, char *dst)); /* 8 */ -EXTERN int TclCopyChannel _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Channel inChan, Tcl_Channel outChan, - int toRead, Tcl_Obj * cmdPtr)); +EXTERN int TclCopyChannel _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Channel inChan, Tcl_Channel outChan, + int toRead, Tcl_Obj *cmdPtr)); #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ /* 9 */ -EXTERN int TclCreatePipeline _ANSI_ARGS_((Tcl_Interp * interp, - int argc, CONST char ** argv, - Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, - TclFile * outPipePtr, TclFile * errFilePtr)); +EXTERN int TclCreatePipeline _ANSI_ARGS_((Tcl_Interp *interp, + int argc, CONST char **argv, + Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, + TclFile *outPipePtr, TclFile *errFilePtr)); #endif /* UNIX */ #ifdef __WIN32__ /* 9 */ -EXTERN int TclCreatePipeline _ANSI_ARGS_((Tcl_Interp * interp, - int argc, CONST char ** argv, - Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, - TclFile * outPipePtr, TclFile * errFilePtr)); +EXTERN int TclCreatePipeline _ANSI_ARGS_((Tcl_Interp *interp, + int argc, CONST char **argv, + Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, + TclFile *outPipePtr, TclFile *errFilePtr)); #endif /* __WIN32__ */ /* 10 */ -EXTERN int TclCreateProc _ANSI_ARGS_((Tcl_Interp * interp, - Namespace * nsPtr, CONST char * procName, - Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr, - Proc ** procPtrPtr)); +EXTERN int TclCreateProc _ANSI_ARGS_((Tcl_Interp *interp, + Namespace *nsPtr, CONST char *procName, + Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, + Proc **procPtrPtr)); /* 11 */ -EXTERN void TclDeleteCompiledLocalVars _ANSI_ARGS_(( - Interp * iPtr, CallFrame * framePtr)); +EXTERN void TclDeleteCompiledLocalVars _ANSI_ARGS_((Interp *iPtr, + CallFrame *framePtr)); /* 12 */ -EXTERN void TclDeleteVars _ANSI_ARGS_((Interp * iPtr, - Tcl_HashTable * tablePtr)); +EXTERN void TclDeleteVars _ANSI_ARGS_((Interp *iPtr, + Tcl_HashTable *tablePtr)); /* 13 */ -EXTERN int TclDoGlob _ANSI_ARGS_((Tcl_Interp * interp, - char * separators, Tcl_DString * headPtr, - char * tail, Tcl_GlobTypeData * types)); +EXTERN int TclDoGlob _ANSI_ARGS_((Tcl_Interp *interp, + char *separators, Tcl_DString *headPtr, + char *tail, Tcl_GlobTypeData *types)); /* 14 */ -EXTERN void TclDumpMemoryInfo _ANSI_ARGS_((FILE * outFile)); +EXTERN void TclDumpMemoryInfo _ANSI_ARGS_((FILE *outFile)); /* Slot 15 is reserved */ /* 16 */ -EXTERN void TclExprFloatError _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN void TclExprFloatError _ANSI_ARGS_((Tcl_Interp *interp, double value)); /* Slot 17 is reserved */ /* Slot 18 is reserved */ @@ -99,130 +99,129 @@ EXTERN void TclExprFloatError _ANSI_ARGS_((Tcl_Interp * interp, /* Slot 20 is reserved */ /* Slot 21 is reserved */ /* 22 */ -EXTERN int TclFindElement _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * listStr, int listLength, - CONST char ** elementPtr, - CONST char ** nextPtr, int * sizePtr, - int * bracePtr)); +EXTERN int TclFindElement _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *listStr, int listLength, + CONST char **elementPtr, + CONST char **nextPtr, int *sizePtr, + int *bracePtr)); /* 23 */ -EXTERN Proc * TclFindProc _ANSI_ARGS_((Interp * iPtr, - CONST char * procName)); +EXTERN Proc * TclFindProc _ANSI_ARGS_((Interp *iPtr, + CONST char *procName)); /* 24 */ -EXTERN int TclFormatInt _ANSI_ARGS_((char * buffer, long n)); +EXTERN int TclFormatInt _ANSI_ARGS_((char *buffer, long n)); /* 25 */ -EXTERN void TclFreePackageInfo _ANSI_ARGS_((Interp * iPtr)); +EXTERN void TclFreePackageInfo _ANSI_ARGS_((Interp *iPtr)); /* Slot 26 is reserved */ /* 27 */ -EXTERN int TclGetDate _ANSI_ARGS_((char * p, Tcl_WideInt now, - long zone, Tcl_WideInt * timePtr)); +EXTERN int TclGetDate _ANSI_ARGS_((char *p, Tcl_WideInt now, + long zone, Tcl_WideInt *timePtr)); /* 28 */ EXTERN Tcl_Channel TclpGetDefaultStdChannel _ANSI_ARGS_((int type)); /* Slot 29 is reserved */ /* Slot 30 is reserved */ /* 31 */ -EXTERN char * TclGetExtension _ANSI_ARGS_((char * name)); +EXTERN char * TclGetExtension _ANSI_ARGS_((char *name)); /* 32 */ -EXTERN int TclGetFrame _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * str, CallFrame ** framePtrPtr)); +EXTERN int TclGetFrame _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *str, CallFrame **framePtrPtr)); /* 33 */ EXTERN TclCmdProcType TclGetInterpProc _ANSI_ARGS_((void)); /* 34 */ -EXTERN int TclGetIntForIndex _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Obj * objPtr, int endValue, - int * indexPtr)); +EXTERN int TclGetIntForIndex _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Obj *objPtr, int endValue, int *indexPtr)); /* Slot 35 is reserved */ /* 36 */ -EXTERN int TclGetLong _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * str, long * longPtr)); +EXTERN int TclGetLong _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *str, long *longPtr)); /* 37 */ -EXTERN int TclGetLoadedPackages _ANSI_ARGS_(( - Tcl_Interp * interp, char * targetName)); +EXTERN int TclGetLoadedPackages _ANSI_ARGS_((Tcl_Interp *interp, + char *targetName)); /* 38 */ EXTERN int TclGetNamespaceForQualName _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * qualName, - Namespace * cxtNsPtr, int flags, - Namespace ** nsPtrPtr, - Namespace ** altNsPtrPtr, - Namespace ** actualCxtPtrPtr, - CONST char ** simpleNamePtr)); + Tcl_Interp *interp, CONST char *qualName, + Namespace *cxtNsPtr, int flags, + Namespace **nsPtrPtr, + Namespace **altNsPtrPtr, + Namespace **actualCxtPtrPtr, + CONST char **simpleNamePtr)); /* 39 */ EXTERN TclObjCmdProcType TclGetObjInterpProc _ANSI_ARGS_((void)); /* 40 */ -EXTERN int TclGetOpenMode _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * str, int * seekFlagPtr)); +EXTERN int TclGetOpenMode _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *str, int *seekFlagPtr)); /* 41 */ EXTERN Tcl_Command TclGetOriginalCommand _ANSI_ARGS_(( Tcl_Command command)); /* 42 */ -EXTERN char * TclpGetUserHome _ANSI_ARGS_((CONST char * name, - Tcl_DString * bufferPtr)); +EXTERN char * TclpGetUserHome _ANSI_ARGS_((CONST char *name, + Tcl_DString *bufferPtr)); /* 43 */ -EXTERN int TclGlobalInvoke _ANSI_ARGS_((Tcl_Interp * interp, - int argc, CONST84 char ** argv, int flags)); +EXTERN int TclGlobalInvoke _ANSI_ARGS_((Tcl_Interp *interp, + int argc, CONST84 char **argv, int flags)); /* 44 */ EXTERN int TclGuessPackageName _ANSI_ARGS_(( - CONST char * fileName, Tcl_DString * bufPtr)); + CONST char *fileName, Tcl_DString *bufPtr)); /* 45 */ EXTERN int TclHideUnsafeCommands _ANSI_ARGS_(( - Tcl_Interp * interp)); + Tcl_Interp *interp)); /* 46 */ EXTERN int TclInExit _ANSI_ARGS_((void)); /* Slot 47 is reserved */ /* Slot 48 is reserved */ /* 49 */ -EXTERN Tcl_Obj * TclIncrVar2 _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, +EXTERN Tcl_Obj * TclIncrVar2 _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, long incrAmount, int part1NotParsed)); /* 50 */ EXTERN void TclInitCompiledLocals _ANSI_ARGS_(( - Tcl_Interp * interp, CallFrame * framePtr, - Namespace * nsPtr)); + Tcl_Interp *interp, CallFrame *framePtr, + Namespace *nsPtr)); /* 51 */ -EXTERN int TclInterpInit _ANSI_ARGS_((Tcl_Interp * interp)); +EXTERN int TclInterpInit _ANSI_ARGS_((Tcl_Interp *interp)); /* 52 */ -EXTERN int TclInvoke _ANSI_ARGS_((Tcl_Interp * interp, int argc, - CONST84 char ** argv, int flags)); +EXTERN int TclInvoke _ANSI_ARGS_((Tcl_Interp *interp, int argc, + CONST84 char **argv, int flags)); /* 53 */ EXTERN int TclInvokeObjectCommand _ANSI_ARGS_(( - ClientData clientData, Tcl_Interp * interp, - int argc, CONST84 char ** argv)); + ClientData clientData, Tcl_Interp *interp, + int argc, CONST84 char **argv)); /* 54 */ EXTERN int TclInvokeStringCommand _ANSI_ARGS_(( - ClientData clientData, Tcl_Interp * interp, + ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); /* 55 */ -EXTERN Proc * TclIsProc _ANSI_ARGS_((Command * cmdPtr)); +EXTERN Proc * TclIsProc _ANSI_ARGS_((Command *cmdPtr)); /* Slot 56 is reserved */ /* Slot 57 is reserved */ /* 58 */ -EXTERN Var * TclLookupVar _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * part1, CONST char * part2, - int flags, CONST char * msg, int createPart1, - int createPart2, Var ** arrayPtrPtr)); +EXTERN Var * TclLookupVar _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *part1, CONST char *part2, + int flags, CONST char *msg, int createPart1, + int createPart2, Var **arrayPtrPtr)); /* Slot 59 is reserved */ /* 60 */ -EXTERN int TclNeedSpace _ANSI_ARGS_((CONST char * start, - CONST char * end)); +EXTERN int TclNeedSpace _ANSI_ARGS_((CONST char *start, + CONST char *end)); /* 61 */ -EXTERN Tcl_Obj * TclNewProcBodyObj _ANSI_ARGS_((Proc * procPtr)); +EXTERN Tcl_Obj * TclNewProcBodyObj _ANSI_ARGS_((Proc *procPtr)); /* 62 */ -EXTERN int TclObjCommandComplete _ANSI_ARGS_((Tcl_Obj * cmdPtr)); +EXTERN int TclObjCommandComplete _ANSI_ARGS_((Tcl_Obj *cmdPtr)); /* 63 */ -EXTERN int TclObjInterpProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp * interp, int objc, +EXTERN int TclObjInterpProc _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); /* 64 */ -EXTERN int TclObjInvoke _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN int TclObjInvoke _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 65 */ -EXTERN int TclObjInvokeGlobal _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN int TclObjInvokeGlobal _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 66 */ EXTERN int TclOpenFileChannelDeleteProc _ANSI_ARGS_(( - TclOpenFileChannelProc_ * proc)); + TclOpenFileChannelProc_ *proc)); /* 67 */ EXTERN int TclOpenFileChannelInsertProc _ANSI_ARGS_(( - TclOpenFileChannelProc_ * proc)); + TclOpenFileChannelProc_ *proc)); /* Slot 68 is reserved */ /* 69 */ EXTERN char * TclpAlloc _ANSI_ARGS_((unsigned int size)); @@ -231,19 +230,19 @@ EXTERN char * TclpAlloc _ANSI_ARGS_((unsigned int size)); /* Slot 72 is reserved */ /* Slot 73 is reserved */ /* 74 */ -EXTERN void TclpFree _ANSI_ARGS_((char * ptr)); +EXTERN void TclpFree _ANSI_ARGS_((char *ptr)); /* 75 */ EXTERN unsigned long TclpGetClicks _ANSI_ARGS_((void)); /* 76 */ EXTERN unsigned long TclpGetSeconds _ANSI_ARGS_((void)); /* 77 */ -EXTERN void TclpGetTime _ANSI_ARGS_((Tcl_Time * time)); +EXTERN void TclpGetTime _ANSI_ARGS_((Tcl_Time *time)); /* 78 */ EXTERN int TclpGetTimeZone _ANSI_ARGS_((Tcl_WideInt time)); /* Slot 79 is reserved */ /* Slot 80 is reserved */ /* 81 */ -EXTERN char * TclpRealloc _ANSI_ARGS_((char * ptr, +EXTERN char * TclpRealloc _ANSI_ARGS_((char *ptr, unsigned int size)); /* Slot 82 is reserved */ /* Slot 83 is reserved */ @@ -252,182 +251,181 @@ EXTERN char * TclpRealloc _ANSI_ARGS_((char * ptr, /* Slot 86 is reserved */ /* Slot 87 is reserved */ /* 88 */ -EXTERN char * TclPrecTraceProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp * interp, CONST char * name1, - CONST char * name2, int flags)); +EXTERN char * TclPrecTraceProc _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, CONST char *name1, + CONST char *name2, int flags)); /* 89 */ -EXTERN int TclPreventAliasLoop _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Interp * cmdInterp, Tcl_Command cmd)); +EXTERN int TclPreventAliasLoop _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Interp *cmdInterp, Tcl_Command cmd)); /* Slot 90 is reserved */ /* 91 */ -EXTERN void TclProcCleanupProc _ANSI_ARGS_((Proc * procPtr)); +EXTERN void TclProcCleanupProc _ANSI_ARGS_((Proc *procPtr)); /* 92 */ -EXTERN int TclProcCompileProc _ANSI_ARGS_((Tcl_Interp * interp, - Proc * procPtr, Tcl_Obj * bodyPtr, - Namespace * nsPtr, CONST char * description, - CONST char * procName)); +EXTERN int TclProcCompileProc _ANSI_ARGS_((Tcl_Interp *interp, + Proc *procPtr, Tcl_Obj *bodyPtr, + Namespace *nsPtr, CONST char *description, + CONST char *procName)); /* 93 */ EXTERN void TclProcDeleteProc _ANSI_ARGS_((ClientData clientData)); /* 94 */ -EXTERN int TclProcInterpProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp * interp, int argc, - CONST84 char ** argv)); +EXTERN int TclProcInterpProc _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, int argc, + CONST84 char **argv)); /* Slot 95 is reserved */ /* 96 */ -EXTERN int TclRenameCommand _ANSI_ARGS_((Tcl_Interp * interp, - char * oldName, char * newName)); +EXTERN int TclRenameCommand _ANSI_ARGS_((Tcl_Interp *interp, + char *oldName, char *newName)); /* 97 */ EXTERN void TclResetShadowedCmdRefs _ANSI_ARGS_(( - Tcl_Interp * interp, Command * newCmdPtr)); + Tcl_Interp *interp, Command *newCmdPtr)); /* 98 */ EXTERN int TclServiceIdle _ANSI_ARGS_((void)); /* Slot 99 is reserved */ /* Slot 100 is reserved */ /* 101 */ -EXTERN char * TclSetPreInitScript _ANSI_ARGS_((char * string)); +EXTERN char * TclSetPreInitScript _ANSI_ARGS_((char *string)); /* 102 */ -EXTERN void TclSetupEnv _ANSI_ARGS_((Tcl_Interp * interp)); +EXTERN void TclSetupEnv _ANSI_ARGS_((Tcl_Interp *interp)); /* 103 */ -EXTERN int TclSockGetPort _ANSI_ARGS_((Tcl_Interp * interp, - char * str, char * proto, int * portPtr)); +EXTERN int TclSockGetPort _ANSI_ARGS_((Tcl_Interp *interp, + char *str, char *proto, int *portPtr)); #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ /* 104 */ -EXTERN int TclSockMinimumBuffers _ANSI_ARGS_((int sock, +EXTERN int TclSockMinimumBuffers _ANSI_ARGS_((int sock, int size)); #endif /* UNIX */ #ifdef __WIN32__ /* 104 */ -EXTERN int TclSockMinimumBuffers _ANSI_ARGS_((int sock, +EXTERN int TclSockMinimumBuffers _ANSI_ARGS_((int sock, int size)); #endif /* __WIN32__ */ /* Slot 105 is reserved */ /* 106 */ -EXTERN int TclStatDeleteProc _ANSI_ARGS_((TclStatProc_ * proc)); +EXTERN int TclStatDeleteProc _ANSI_ARGS_((TclStatProc_ *proc)); /* 107 */ -EXTERN int TclStatInsertProc _ANSI_ARGS_((TclStatProc_ * proc)); +EXTERN int TclStatInsertProc _ANSI_ARGS_((TclStatProc_ *proc)); /* 108 */ -EXTERN void TclTeardownNamespace _ANSI_ARGS_((Namespace * nsPtr)); +EXTERN void TclTeardownNamespace _ANSI_ARGS_((Namespace *nsPtr)); /* 109 */ -EXTERN int TclUpdateReturnInfo _ANSI_ARGS_((Interp * iPtr)); +EXTERN int TclUpdateReturnInfo _ANSI_ARGS_((Interp *iPtr)); /* Slot 110 is reserved */ /* 111 */ EXTERN void Tcl_AddInterpResolvers _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * name, - Tcl_ResolveCmdProc * cmdProc, - Tcl_ResolveVarProc * varProc, - Tcl_ResolveCompiledVarProc * compiledVarProc)); + Tcl_Interp *interp, CONST char *name, + Tcl_ResolveCmdProc *cmdProc, + Tcl_ResolveVarProc *varProc, + Tcl_ResolveCompiledVarProc *compiledVarProc)); /* 112 */ -EXTERN int Tcl_AppendExportList _ANSI_ARGS_(( - Tcl_Interp * interp, Tcl_Namespace * nsPtr, - Tcl_Obj * objPtr)); +EXTERN int Tcl_AppendExportList _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Namespace *nsPtr, Tcl_Obj *objPtr)); /* 113 */ -EXTERN Tcl_Namespace * Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * name, ClientData clientData, - Tcl_NamespaceDeleteProc * deleteProc)); +EXTERN Tcl_Namespace * Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *name, ClientData clientData, + Tcl_NamespaceDeleteProc *deleteProc)); /* 114 */ EXTERN void Tcl_DeleteNamespace _ANSI_ARGS_(( - Tcl_Namespace * nsPtr)); + Tcl_Namespace *nsPtr)); /* 115 */ -EXTERN int Tcl_Export _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Namespace * nsPtr, CONST char * pattern, +EXTERN int Tcl_Export _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Namespace *nsPtr, CONST char *pattern, int resetListFirst)); /* 116 */ -EXTERN Tcl_Command Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * name, - Tcl_Namespace * contextNsPtr, int flags)); +EXTERN Tcl_Command Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *name, + Tcl_Namespace *contextNsPtr, int flags)); /* 117 */ -EXTERN Tcl_Namespace * Tcl_FindNamespace _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * name, - Tcl_Namespace * contextNsPtr, int flags)); +EXTERN Tcl_Namespace * Tcl_FindNamespace _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *name, + Tcl_Namespace *contextNsPtr, int flags)); /* 118 */ EXTERN int Tcl_GetInterpResolvers _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * name, - Tcl_ResolverInfo * resInfo)); + Tcl_Interp *interp, CONST char *name, + Tcl_ResolverInfo *resInfo)); /* 119 */ EXTERN int Tcl_GetNamespaceResolvers _ANSI_ARGS_(( - Tcl_Namespace * namespacePtr, - Tcl_ResolverInfo * resInfo)); + Tcl_Namespace *namespacePtr, + Tcl_ResolverInfo *resInfo)); /* 120 */ -EXTERN Tcl_Var Tcl_FindNamespaceVar _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * name, - Tcl_Namespace * contextNsPtr, int flags)); +EXTERN Tcl_Var Tcl_FindNamespaceVar _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *name, + Tcl_Namespace *contextNsPtr, int flags)); /* 121 */ -EXTERN int Tcl_ForgetImport _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Namespace * nsPtr, CONST char * pattern)); +EXTERN int Tcl_ForgetImport _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Namespace *nsPtr, CONST char *pattern)); /* 122 */ EXTERN Tcl_Command Tcl_GetCommandFromObj _ANSI_ARGS_(( - Tcl_Interp * interp, Tcl_Obj * objPtr)); + Tcl_Interp *interp, Tcl_Obj *objPtr)); /* 123 */ EXTERN void Tcl_GetCommandFullName _ANSI_ARGS_(( - Tcl_Interp * interp, Tcl_Command command, - Tcl_Obj * objPtr)); + Tcl_Interp *interp, Tcl_Command command, + Tcl_Obj *objPtr)); /* 124 */ EXTERN Tcl_Namespace * Tcl_GetCurrentNamespace _ANSI_ARGS_(( - Tcl_Interp * interp)); + Tcl_Interp *interp)); /* 125 */ EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_(( - Tcl_Interp * interp)); + Tcl_Interp *interp)); /* 126 */ EXTERN void Tcl_GetVariableFullName _ANSI_ARGS_(( - Tcl_Interp * interp, Tcl_Var variable, - Tcl_Obj * objPtr)); + Tcl_Interp *interp, Tcl_Var variable, + Tcl_Obj *objPtr)); /* 127 */ -EXTERN int Tcl_Import _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Namespace * nsPtr, CONST char * pattern, +EXTERN int Tcl_Import _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Namespace *nsPtr, CONST char *pattern, int allowOverwrite)); /* 128 */ -EXTERN void Tcl_PopCallFrame _ANSI_ARGS_((Tcl_Interp* interp)); +EXTERN void Tcl_PopCallFrame _ANSI_ARGS_((Tcl_Interp *interp)); /* 129 */ -EXTERN int Tcl_PushCallFrame _ANSI_ARGS_((Tcl_Interp* interp, - Tcl_CallFrame * framePtr, - Tcl_Namespace * nsPtr, int isProcCallFrame)); +EXTERN int Tcl_PushCallFrame _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_CallFrame *framePtr, + Tcl_Namespace *nsPtr, int isProcCallFrame)); /* 130 */ EXTERN int Tcl_RemoveInterpResolvers _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * name)); + Tcl_Interp *interp, CONST char *name)); /* 131 */ EXTERN void Tcl_SetNamespaceResolvers _ANSI_ARGS_(( - Tcl_Namespace * namespacePtr, - Tcl_ResolveCmdProc * cmdProc, - Tcl_ResolveVarProc * varProc, - Tcl_ResolveCompiledVarProc * compiledVarProc)); + Tcl_Namespace *namespacePtr, + Tcl_ResolveCmdProc *cmdProc, + Tcl_ResolveVarProc *varProc, + Tcl_ResolveCompiledVarProc *compiledVarProc)); /* 132 */ -EXTERN int TclpHasSockets _ANSI_ARGS_((Tcl_Interp * interp)); +EXTERN int TclpHasSockets _ANSI_ARGS_((Tcl_Interp *interp)); /* 133 */ EXTERN struct tm * TclpGetDate _ANSI_ARGS_((TclpTime_t time, int useGMT)); /* 134 */ -EXTERN size_t TclpStrftime _ANSI_ARGS_((char * s, size_t maxsize, - CONST char * format, CONST struct tm * t, +EXTERN size_t TclpStrftime _ANSI_ARGS_((char *s, size_t maxsize, + CONST char *format, CONST struct tm *t, int useGMT)); /* 135 */ EXTERN int TclpCheckStackSpace _ANSI_ARGS_((void)); /* Slot 136 is reserved */ /* Slot 137 is reserved */ /* 138 */ -EXTERN CONST84_RETURN char * TclGetEnv _ANSI_ARGS_((CONST char * name, - Tcl_DString * valuePtr)); +EXTERN CONST84_RETURN char * TclGetEnv _ANSI_ARGS_((CONST char *name, + Tcl_DString *valuePtr)); /* Slot 139 is reserved */ /* 140 */ -EXTERN int TclLooksLikeInt _ANSI_ARGS_((CONST char * bytes, +EXTERN int TclLooksLikeInt _ANSI_ARGS_((CONST char *bytes, int length)); /* 141 */ -EXTERN CONST84_RETURN char * TclpGetCwd _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_DString * cwdPtr)); +EXTERN CONST84_RETURN char * TclpGetCwd _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_DString *cwdPtr)); /* 142 */ EXTERN int TclSetByteCodeFromAny _ANSI_ARGS_(( - Tcl_Interp * interp, Tcl_Obj * objPtr, - CompileHookProc * hookProc, + Tcl_Interp *interp, Tcl_Obj *objPtr, + CompileHookProc *hookProc, ClientData clientData)); /* 143 */ EXTERN int TclAddLiteralObj _ANSI_ARGS_(( - struct CompileEnv * envPtr, Tcl_Obj * objPtr, - LiteralEntry ** litPtrPtr)); + struct CompileEnv *envPtr, Tcl_Obj *objPtr, + LiteralEntry **litPtrPtr)); /* 144 */ -EXTERN void TclHideLiteral _ANSI_ARGS_((Tcl_Interp * interp, - struct CompileEnv * envPtr, int index)); +EXTERN void TclHideLiteral _ANSI_ARGS_((Tcl_Interp *interp, + struct CompileEnv *envPtr, int index)); /* 145 */ -EXTERN struct AuxDataType * TclGetAuxDataType _ANSI_ARGS_((char * typeName)); +EXTERN struct AuxDataType * TclGetAuxDataType _ANSI_ARGS_((char *typeName)); /* 146 */ -EXTERN TclHandle TclHandleCreate _ANSI_ARGS_((VOID * ptr)); +EXTERN TclHandle TclHandleCreate _ANSI_ARGS_((VOID *ptr)); /* 147 */ EXTERN void TclHandleFree _ANSI_ARGS_((TclHandle handle)); /* 148 */ @@ -435,71 +433,70 @@ EXTERN TclHandle TclHandlePreserve _ANSI_ARGS_((TclHandle handle)); /* 149 */ EXTERN void TclHandleRelease _ANSI_ARGS_((TclHandle handle)); /* 150 */ -EXTERN int TclRegAbout _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN int TclRegAbout _ANSI_ARGS_((Tcl_Interp *interp, Tcl_RegExp re)); /* 151 */ -EXTERN void TclRegExpRangeUniChar _ANSI_ARGS_((Tcl_RegExp re, - int index, int * startPtr, int * endPtr)); +EXTERN void TclRegExpRangeUniChar _ANSI_ARGS_((Tcl_RegExp re, + int index, int *startPtr, int *endPtr)); /* 152 */ -EXTERN void TclSetLibraryPath _ANSI_ARGS_((Tcl_Obj * pathPtr)); +EXTERN void TclSetLibraryPath _ANSI_ARGS_((Tcl_Obj *pathPtr)); /* 153 */ EXTERN Tcl_Obj * TclGetLibraryPath _ANSI_ARGS_((void)); /* Slot 154 is reserved */ /* Slot 155 is reserved */ /* 156 */ -EXTERN void TclRegError _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * msg, int status)); +EXTERN void TclRegError _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *msg, int status)); /* 157 */ -EXTERN Var * TclVarTraceExists _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * varName)); +EXTERN Var * TclVarTraceExists _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *varName)); /* 158 */ EXTERN void TclSetStartupScriptFileName _ANSI_ARGS_(( - CONST char * filename)); + CONST char *filename)); /* 159 */ EXTERN CONST84_RETURN char * TclGetStartupScriptFileName _ANSI_ARGS_((void)); /* Slot 160 is reserved */ /* 161 */ -EXTERN int TclChannelTransform _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Channel chan, Tcl_Obj * cmdObjPtr)); +EXTERN int TclChannelTransform _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Channel chan, Tcl_Obj *cmdObjPtr)); /* 162 */ EXTERN void TclChannelEventScriptInvoker _ANSI_ARGS_(( ClientData clientData, int flags)); /* 163 */ EXTERN VOID * TclGetInstructionTable _ANSI_ARGS_((void)); /* 164 */ -EXTERN void TclExpandCodeArray _ANSI_ARGS_((VOID * envPtr)); +EXTERN void TclExpandCodeArray _ANSI_ARGS_((VOID *envPtr)); /* 165 */ EXTERN void TclpSetInitialEncodings _ANSI_ARGS_((void)); /* 166 */ -EXTERN int TclListObjSetElement _ANSI_ARGS_(( - Tcl_Interp * interp, Tcl_Obj * listPtr, - int index, Tcl_Obj * valuePtr)); +EXTERN int TclListObjSetElement _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Obj *listPtr, int index, + Tcl_Obj *valuePtr)); /* 167 */ EXTERN void TclSetStartupScriptPath _ANSI_ARGS_(( - Tcl_Obj * pathPtr)); + Tcl_Obj *pathPtr)); /* 168 */ EXTERN Tcl_Obj * TclGetStartupScriptPath _ANSI_ARGS_((void)); /* 169 */ -EXTERN int TclpUtfNcmp2 _ANSI_ARGS_((CONST char * s1, - CONST char * s2, unsigned long n)); +EXTERN int TclpUtfNcmp2 _ANSI_ARGS_((CONST char *s1, + CONST char *s2, unsigned long n)); /* 170 */ -EXTERN int TclCheckInterpTraces _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * command, - int numChars, Command * cmdPtr, int result, - int traceFlags, int objc, - Tcl_Obj *CONST objv[])); +EXTERN int TclCheckInterpTraces _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *command, int numChars, + Command *cmdPtr, int result, int traceFlags, + int objc, Tcl_Obj *CONST objv[])); /* 171 */ EXTERN int TclCheckExecutionTraces _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * command, - int numChars, Command * cmdPtr, int result, - int traceFlags, int objc, + Tcl_Interp *interp, CONST char *command, + int numChars, Command *cmdPtr, int result, + int traceFlags, int objc, Tcl_Obj *CONST objv[])); /* 172 */ EXTERN int TclInThreadExit _ANSI_ARGS_((void)); /* 173 */ EXTERN int TclUniCharMatch _ANSI_ARGS_(( - CONST Tcl_UniChar * string, int strLen, - CONST Tcl_UniChar * pattern, int ptnLen, + CONST Tcl_UniChar *string, int strLen, + CONST Tcl_UniChar *pattern, int ptnLen, int nocase)); /* Slot 174 is reserved */ /* Slot 175 is reserved */ @@ -529,132 +526,132 @@ EXTERN struct tm * TclpGmtime _ANSI_ARGS_((TclpTime_t_CONST clock)); /* Slot 197 is reserved */ /* Slot 198 is reserved */ /* 199 */ -EXTERN int TclMatchIsTrivial _ANSI_ARGS_((CONST char * pattern)); +EXTERN int TclMatchIsTrivial _ANSI_ARGS_((CONST char *pattern)); typedef struct TclIntStubs { int magic; struct TclIntStubHooks *hooks; - void *reserved0; - int (*tclAccessDeleteProc) _ANSI_ARGS_((TclAccessProc_ * proc)); /* 1 */ - int (*tclAccessInsertProc) _ANSI_ARGS_((TclAccessProc_ * proc)); /* 2 */ + VOID *reserved0; + int (*tclAccessDeleteProc) _ANSI_ARGS_((TclAccessProc_ *proc)); /* 1 */ + int (*tclAccessInsertProc) _ANSI_ARGS_((TclAccessProc_ *proc)); /* 2 */ void (*tclAllocateFreeObjects) _ANSI_ARGS_((void)); /* 3 */ - void *reserved4; + VOID *reserved4; #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - int (*tclCleanupChildren) _ANSI_ARGS_((Tcl_Interp * interp, int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan)); /* 5 */ + int (*tclCleanupChildren) _ANSI_ARGS_((Tcl_Interp *interp, int numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan)); /* 5 */ #endif /* UNIX */ #ifdef __WIN32__ - int (*tclCleanupChildren) _ANSI_ARGS_((Tcl_Interp * interp, int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan)); /* 5 */ + int (*tclCleanupChildren) _ANSI_ARGS_((Tcl_Interp *interp, int numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan)); /* 5 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void *reserved5; + VOID *reserved5; #endif /* MAC_TCL */ - void (*tclCleanupCommand) _ANSI_ARGS_((Command * cmdPtr)); /* 6 */ - int (*tclCopyAndCollapse) _ANSI_ARGS_((int count, CONST char * src, char * dst)); /* 7 */ - int (*tclCopyChannel) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj * cmdPtr)); /* 8 */ + void (*tclCleanupCommand) _ANSI_ARGS_((Command *cmdPtr)); /* 6 */ + int (*tclCopyAndCollapse) _ANSI_ARGS_((int count, CONST char *src, char *dst)); /* 7 */ + int (*tclCopyChannel) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr)); /* 8 */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - int (*tclCreatePipeline) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr)); /* 9 */ + int (*tclCreatePipeline) _ANSI_ARGS_((Tcl_Interp *interp, int argc, CONST char **argv, Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr, TclFile *errFilePtr)); /* 9 */ #endif /* UNIX */ #ifdef __WIN32__ - int (*tclCreatePipeline) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr)); /* 9 */ + int (*tclCreatePipeline) _ANSI_ARGS_((Tcl_Interp *interp, int argc, CONST char **argv, Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr, TclFile *errFilePtr)); /* 9 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void *reserved9; + VOID *reserved9; #endif /* MAC_TCL */ - int (*tclCreateProc) _ANSI_ARGS_((Tcl_Interp * interp, Namespace * nsPtr, CONST char * procName, Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr, Proc ** procPtrPtr)); /* 10 */ - void (*tclDeleteCompiledLocalVars) _ANSI_ARGS_((Interp * iPtr, CallFrame * framePtr)); /* 11 */ - void (*tclDeleteVars) _ANSI_ARGS_((Interp * iPtr, Tcl_HashTable * tablePtr)); /* 12 */ - int (*tclDoGlob) _ANSI_ARGS_((Tcl_Interp * interp, char * separators, Tcl_DString * headPtr, char * tail, Tcl_GlobTypeData * types)); /* 13 */ - void (*tclDumpMemoryInfo) _ANSI_ARGS_((FILE * outFile)); /* 14 */ - void *reserved15; - void (*tclExprFloatError) _ANSI_ARGS_((Tcl_Interp * interp, double value)); /* 16 */ - void *reserved17; - void *reserved18; - void *reserved19; - void *reserved20; - void *reserved21; - int (*tclFindElement) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * listStr, int listLength, CONST char ** elementPtr, CONST char ** nextPtr, int * sizePtr, int * bracePtr)); /* 22 */ - Proc * (*tclFindProc) _ANSI_ARGS_((Interp * iPtr, CONST char * procName)); /* 23 */ - int (*tclFormatInt) _ANSI_ARGS_((char * buffer, long n)); /* 24 */ - void (*tclFreePackageInfo) _ANSI_ARGS_((Interp * iPtr)); /* 25 */ - void *reserved26; - int (*tclGetDate) _ANSI_ARGS_((char * p, Tcl_WideInt now, long zone, Tcl_WideInt * timePtr)); /* 27 */ + int (*tclCreateProc) _ANSI_ARGS_((Tcl_Interp *interp, Namespace *nsPtr, CONST char *procName, Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Proc **procPtrPtr)); /* 10 */ + void (*tclDeleteCompiledLocalVars) _ANSI_ARGS_((Interp *iPtr, CallFrame *framePtr)); /* 11 */ + void (*tclDeleteVars) _ANSI_ARGS_((Interp *iPtr, Tcl_HashTable *tablePtr)); /* 12 */ + int (*tclDoGlob) _ANSI_ARGS_((Tcl_Interp *interp, char *separators, Tcl_DString *headPtr, char *tail, Tcl_GlobTypeData *types)); /* 13 */ + void (*tclDumpMemoryInfo) _ANSI_ARGS_((FILE *outFile)); /* 14 */ + VOID *reserved15; + void (*tclExprFloatError) _ANSI_ARGS_((Tcl_Interp *interp, double value)); /* 16 */ + VOID *reserved17; + VOID *reserved18; + VOID *reserved19; + VOID *reserved20; + VOID *reserved21; + int (*tclFindElement) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *listStr, int listLength, CONST char **elementPtr, CONST char **nextPtr, int *sizePtr, int *bracePtr)); /* 22 */ + Proc * (*tclFindProc) _ANSI_ARGS_((Interp *iPtr, CONST char *procName)); /* 23 */ + int (*tclFormatInt) _ANSI_ARGS_((char *buffer, long n)); /* 24 */ + void (*tclFreePackageInfo) _ANSI_ARGS_((Interp *iPtr)); /* 25 */ + VOID *reserved26; + int (*tclGetDate) _ANSI_ARGS_((char *p, Tcl_WideInt now, long zone, Tcl_WideInt *timePtr)); /* 27 */ Tcl_Channel (*tclpGetDefaultStdChannel) _ANSI_ARGS_((int type)); /* 28 */ - void *reserved29; - void *reserved30; - char * (*tclGetExtension) _ANSI_ARGS_((char * name)); /* 31 */ - int (*tclGetFrame) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, CallFrame ** framePtrPtr)); /* 32 */ + VOID *reserved29; + VOID *reserved30; + char * (*tclGetExtension) _ANSI_ARGS_((char *name)); /* 31 */ + int (*tclGetFrame) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, CallFrame **framePtrPtr)); /* 32 */ TclCmdProcType (*tclGetInterpProc) _ANSI_ARGS_((void)); /* 33 */ - int (*tclGetIntForIndex) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, int endValue, int * indexPtr)); /* 34 */ - void *reserved35; - int (*tclGetLong) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, long * longPtr)); /* 36 */ - int (*tclGetLoadedPackages) _ANSI_ARGS_((Tcl_Interp * interp, char * targetName)); /* 37 */ - int (*tclGetNamespaceForQualName) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * qualName, Namespace * cxtNsPtr, int flags, Namespace ** nsPtrPtr, Namespace ** altNsPtrPtr, Namespace ** actualCxtPtrPtr, CONST char ** simpleNamePtr)); /* 38 */ + int (*tclGetIntForIndex) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, int endValue, int *indexPtr)); /* 34 */ + VOID *reserved35; + int (*tclGetLong) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, long *longPtr)); /* 36 */ + int (*tclGetLoadedPackages) _ANSI_ARGS_((Tcl_Interp *interp, char *targetName)); /* 37 */ + int (*tclGetNamespaceForQualName) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *qualName, Namespace *cxtNsPtr, int flags, Namespace **nsPtrPtr, Namespace **altNsPtrPtr, Namespace **actualCxtPtrPtr, CONST char **simpleNamePtr)); /* 38 */ TclObjCmdProcType (*tclGetObjInterpProc) _ANSI_ARGS_((void)); /* 39 */ - int (*tclGetOpenMode) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, int * seekFlagPtr)); /* 40 */ + int (*tclGetOpenMode) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, int *seekFlagPtr)); /* 40 */ Tcl_Command (*tclGetOriginalCommand) _ANSI_ARGS_((Tcl_Command command)); /* 41 */ - char * (*tclpGetUserHome) _ANSI_ARGS_((CONST char * name, Tcl_DString * bufferPtr)); /* 42 */ - int (*tclGlobalInvoke) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags)); /* 43 */ - int (*tclGuessPackageName) _ANSI_ARGS_((CONST char * fileName, Tcl_DString * bufPtr)); /* 44 */ - int (*tclHideUnsafeCommands) _ANSI_ARGS_((Tcl_Interp * interp)); /* 45 */ + char * (*tclpGetUserHome) _ANSI_ARGS_((CONST char *name, Tcl_DString *bufferPtr)); /* 42 */ + int (*tclGlobalInvoke) _ANSI_ARGS_((Tcl_Interp *interp, int argc, CONST84 char **argv, int flags)); /* 43 */ + int (*tclGuessPackageName) _ANSI_ARGS_((CONST char *fileName, Tcl_DString *bufPtr)); /* 44 */ + int (*tclHideUnsafeCommands) _ANSI_ARGS_((Tcl_Interp *interp)); /* 45 */ int (*tclInExit) _ANSI_ARGS_((void)); /* 46 */ - void *reserved47; - void *reserved48; - Tcl_Obj * (*tclIncrVar2) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, long incrAmount, int part1NotParsed)); /* 49 */ - void (*tclInitCompiledLocals) _ANSI_ARGS_((Tcl_Interp * interp, CallFrame * framePtr, Namespace * nsPtr)); /* 50 */ - int (*tclInterpInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 51 */ - int (*tclInvoke) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags)); /* 52 */ - int (*tclInvokeObjectCommand) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int argc, CONST84 char ** argv)); /* 53 */ - int (*tclInvokeStringCommand) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 54 */ - Proc * (*tclIsProc) _ANSI_ARGS_((Command * cmdPtr)); /* 55 */ - void *reserved56; - void *reserved57; - Var * (*tclLookupVar) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags, CONST char * msg, int createPart1, int createPart2, Var ** arrayPtrPtr)); /* 58 */ - void *reserved59; - int (*tclNeedSpace) _ANSI_ARGS_((CONST char * start, CONST char * end)); /* 60 */ - Tcl_Obj * (*tclNewProcBodyObj) _ANSI_ARGS_((Proc * procPtr)); /* 61 */ - int (*tclObjCommandComplete) _ANSI_ARGS_((Tcl_Obj * cmdPtr)); /* 62 */ - int (*tclObjInterpProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 63 */ - int (*tclObjInvoke) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 64 */ - int (*tclObjInvokeGlobal) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 65 */ - int (*tclOpenFileChannelDeleteProc) _ANSI_ARGS_((TclOpenFileChannelProc_ * proc)); /* 66 */ - int (*tclOpenFileChannelInsertProc) _ANSI_ARGS_((TclOpenFileChannelProc_ * proc)); /* 67 */ - void *reserved68; + VOID *reserved47; + VOID *reserved48; + Tcl_Obj * (*tclIncrVar2) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, long incrAmount, int part1NotParsed)); /* 49 */ + void (*tclInitCompiledLocals) _ANSI_ARGS_((Tcl_Interp *interp, CallFrame *framePtr, Namespace *nsPtr)); /* 50 */ + int (*tclInterpInit) _ANSI_ARGS_((Tcl_Interp *interp)); /* 51 */ + int (*tclInvoke) _ANSI_ARGS_((Tcl_Interp *interp, int argc, CONST84 char **argv, int flags)); /* 52 */ + int (*tclInvokeObjectCommand) _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char **argv)); /* 53 */ + int (*tclInvokeStringCommand) _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); /* 54 */ + Proc * (*tclIsProc) _ANSI_ARGS_((Command *cmdPtr)); /* 55 */ + VOID *reserved56; + VOID *reserved57; + Var * (*tclLookupVar) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *part1, CONST char *part2, int flags, CONST char *msg, int createPart1, int createPart2, Var **arrayPtrPtr)); /* 58 */ + VOID *reserved59; + int (*tclNeedSpace) _ANSI_ARGS_((CONST char *start, CONST char *end)); /* 60 */ + Tcl_Obj * (*tclNewProcBodyObj) _ANSI_ARGS_((Proc *procPtr)); /* 61 */ + int (*tclObjCommandComplete) _ANSI_ARGS_((Tcl_Obj *cmdPtr)); /* 62 */ + int (*tclObjInterpProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); /* 63 */ + int (*tclObjInvoke) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 64 */ + int (*tclObjInvokeGlobal) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 65 */ + int (*tclOpenFileChannelDeleteProc) _ANSI_ARGS_((TclOpenFileChannelProc_ *proc)); /* 66 */ + int (*tclOpenFileChannelInsertProc) _ANSI_ARGS_((TclOpenFileChannelProc_ *proc)); /* 67 */ + VOID *reserved68; char * (*tclpAlloc) _ANSI_ARGS_((unsigned int size)); /* 69 */ - void *reserved70; - void *reserved71; - void *reserved72; - void *reserved73; - void (*tclpFree) _ANSI_ARGS_((char * ptr)); /* 74 */ + VOID *reserved70; + VOID *reserved71; + VOID *reserved72; + VOID *reserved73; + void (*tclpFree) _ANSI_ARGS_((char *ptr)); /* 74 */ unsigned long (*tclpGetClicks) _ANSI_ARGS_((void)); /* 75 */ unsigned long (*tclpGetSeconds) _ANSI_ARGS_((void)); /* 76 */ - void (*tclpGetTime) _ANSI_ARGS_((Tcl_Time * time)); /* 77 */ + void (*tclpGetTime) _ANSI_ARGS_((Tcl_Time *time)); /* 77 */ int (*tclpGetTimeZone) _ANSI_ARGS_((Tcl_WideInt time)); /* 78 */ - void *reserved79; - void *reserved80; - char * (*tclpRealloc) _ANSI_ARGS_((char * ptr, unsigned int size)); /* 81 */ - void *reserved82; - void *reserved83; - void *reserved84; - void *reserved85; - void *reserved86; - void *reserved87; - char * (*tclPrecTraceProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, CONST char * name1, CONST char * name2, int flags)); /* 88 */ - int (*tclPreventAliasLoop) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Interp * cmdInterp, Tcl_Command cmd)); /* 89 */ - void *reserved90; - void (*tclProcCleanupProc) _ANSI_ARGS_((Proc * procPtr)); /* 91 */ - int (*tclProcCompileProc) _ANSI_ARGS_((Tcl_Interp * interp, Proc * procPtr, Tcl_Obj * bodyPtr, Namespace * nsPtr, CONST char * description, CONST char * procName)); /* 92 */ + VOID *reserved79; + VOID *reserved80; + char * (*tclpRealloc) _ANSI_ARGS_((char *ptr, unsigned int size)); /* 81 */ + VOID *reserved82; + VOID *reserved83; + VOID *reserved84; + VOID *reserved85; + VOID *reserved86; + VOID *reserved87; + char * (*tclPrecTraceProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flags)); /* 88 */ + int (*tclPreventAliasLoop) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Interp *cmdInterp, Tcl_Command cmd)); /* 89 */ + VOID *reserved90; + void (*tclProcCleanupProc) _ANSI_ARGS_((Proc *procPtr)); /* 91 */ + int (*tclProcCompileProc) _ANSI_ARGS_((Tcl_Interp *interp, Proc *procPtr, Tcl_Obj *bodyPtr, Namespace *nsPtr, CONST char *description, CONST char *procName)); /* 92 */ void (*tclProcDeleteProc) _ANSI_ARGS_((ClientData clientData)); /* 93 */ - int (*tclProcInterpProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int argc, CONST84 char ** argv)); /* 94 */ - void *reserved95; - int (*tclRenameCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * oldName, char * newName)); /* 96 */ - void (*tclResetShadowedCmdRefs) _ANSI_ARGS_((Tcl_Interp * interp, Command * newCmdPtr)); /* 97 */ + int (*tclProcInterpProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char **argv)); /* 94 */ + VOID *reserved95; + int (*tclRenameCommand) _ANSI_ARGS_((Tcl_Interp *interp, char *oldName, char *newName)); /* 96 */ + void (*tclResetShadowedCmdRefs) _ANSI_ARGS_((Tcl_Interp *interp, Command *newCmdPtr)); /* 97 */ int (*tclServiceIdle) _ANSI_ARGS_((void)); /* 98 */ - void *reserved99; - void *reserved100; - char * (*tclSetPreInitScript) _ANSI_ARGS_((char * string)); /* 101 */ - void (*tclSetupEnv) _ANSI_ARGS_((Tcl_Interp * interp)); /* 102 */ - int (*tclSockGetPort) _ANSI_ARGS_((Tcl_Interp * interp, char * str, char * proto, int * portPtr)); /* 103 */ + VOID *reserved99; + VOID *reserved100; + char * (*tclSetPreInitScript) _ANSI_ARGS_((char *string)); /* 101 */ + void (*tclSetupEnv) _ANSI_ARGS_((Tcl_Interp *interp)); /* 102 */ + int (*tclSockGetPort) _ANSI_ARGS_((Tcl_Interp *interp, char *str, char *proto, int *portPtr)); /* 103 */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ int (*tclSockMinimumBuffers) _ANSI_ARGS_((int sock, int size)); /* 104 */ #endif /* UNIX */ @@ -662,103 +659,103 @@ typedef struct TclIntStubs { int (*tclSockMinimumBuffers) _ANSI_ARGS_((int sock, int size)); /* 104 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void *reserved104; + VOID *reserved104; #endif /* MAC_TCL */ - void *reserved105; - int (*tclStatDeleteProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 106 */ - int (*tclStatInsertProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 107 */ - void (*tclTeardownNamespace) _ANSI_ARGS_((Namespace * nsPtr)); /* 108 */ - int (*tclUpdateReturnInfo) _ANSI_ARGS_((Interp * iPtr)); /* 109 */ - void *reserved110; - void (*tcl_AddInterpResolvers) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, Tcl_ResolveCmdProc * cmdProc, Tcl_ResolveVarProc * varProc, Tcl_ResolveCompiledVarProc * compiledVarProc)); /* 111 */ - int (*tcl_AppendExportList) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Namespace * nsPtr, Tcl_Obj * objPtr)); /* 112 */ - Tcl_Namespace * (*tcl_CreateNamespace) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, ClientData clientData, Tcl_NamespaceDeleteProc * deleteProc)); /* 113 */ - void (*tcl_DeleteNamespace) _ANSI_ARGS_((Tcl_Namespace * nsPtr)); /* 114 */ - int (*tcl_Export) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern, int resetListFirst)); /* 115 */ - Tcl_Command (*tcl_FindCommand) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags)); /* 116 */ - Tcl_Namespace * (*tcl_FindNamespace) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags)); /* 117 */ - int (*tcl_GetInterpResolvers) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, Tcl_ResolverInfo * resInfo)); /* 118 */ - int (*tcl_GetNamespaceResolvers) _ANSI_ARGS_((Tcl_Namespace * namespacePtr, Tcl_ResolverInfo * resInfo)); /* 119 */ - Tcl_Var (*tcl_FindNamespaceVar) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags)); /* 120 */ - int (*tcl_ForgetImport) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern)); /* 121 */ - Tcl_Command (*tcl_GetCommandFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr)); /* 122 */ - void (*tcl_GetCommandFullName) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Command command, Tcl_Obj * objPtr)); /* 123 */ - Tcl_Namespace * (*tcl_GetCurrentNamespace) _ANSI_ARGS_((Tcl_Interp * interp)); /* 124 */ - Tcl_Namespace * (*tcl_GetGlobalNamespace) _ANSI_ARGS_((Tcl_Interp * interp)); /* 125 */ - void (*tcl_GetVariableFullName) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Var variable, Tcl_Obj * objPtr)); /* 126 */ - int (*tcl_Import) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern, int allowOverwrite)); /* 127 */ - void (*tcl_PopCallFrame) _ANSI_ARGS_((Tcl_Interp* interp)); /* 128 */ - int (*tcl_PushCallFrame) _ANSI_ARGS_((Tcl_Interp* interp, Tcl_CallFrame * framePtr, Tcl_Namespace * nsPtr, int isProcCallFrame)); /* 129 */ - int (*tcl_RemoveInterpResolvers) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name)); /* 130 */ - void (*tcl_SetNamespaceResolvers) _ANSI_ARGS_((Tcl_Namespace * namespacePtr, Tcl_ResolveCmdProc * cmdProc, Tcl_ResolveVarProc * varProc, Tcl_ResolveCompiledVarProc * compiledVarProc)); /* 131 */ - int (*tclpHasSockets) _ANSI_ARGS_((Tcl_Interp * interp)); /* 132 */ + VOID *reserved105; + int (*tclStatDeleteProc) _ANSI_ARGS_((TclStatProc_ *proc)); /* 106 */ + int (*tclStatInsertProc) _ANSI_ARGS_((TclStatProc_ *proc)); /* 107 */ + void (*tclTeardownNamespace) _ANSI_ARGS_((Namespace *nsPtr)); /* 108 */ + int (*tclUpdateReturnInfo) _ANSI_ARGS_((Interp *iPtr)); /* 109 */ + VOID *reserved110; + void (*tcl_AddInterpResolvers) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc)); /* 111 */ + int (*tcl_AppendExportList) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *objPtr)); /* 112 */ + Tcl_Namespace * (*tcl_CreateNamespace) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc)); /* 113 */ + void (*tcl_DeleteNamespace) _ANSI_ARGS_((Tcl_Namespace *nsPtr)); /* 114 */ + int (*tcl_Export) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Namespace *nsPtr, CONST char *pattern, int resetListFirst)); /* 115 */ + Tcl_Command (*tcl_FindCommand) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, Tcl_Namespace *contextNsPtr, int flags)); /* 116 */ + Tcl_Namespace * (*tcl_FindNamespace) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, Tcl_Namespace *contextNsPtr, int flags)); /* 117 */ + int (*tcl_GetInterpResolvers) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, Tcl_ResolverInfo *resInfo)); /* 118 */ + int (*tcl_GetNamespaceResolvers) _ANSI_ARGS_((Tcl_Namespace *namespacePtr, Tcl_ResolverInfo *resInfo)); /* 119 */ + Tcl_Var (*tcl_FindNamespaceVar) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, Tcl_Namespace *contextNsPtr, int flags)); /* 120 */ + int (*tcl_ForgetImport) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Namespace *nsPtr, CONST char *pattern)); /* 121 */ + Tcl_Command (*tcl_GetCommandFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr)); /* 122 */ + void (*tcl_GetCommandFullName) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr)); /* 123 */ + Tcl_Namespace * (*tcl_GetCurrentNamespace) _ANSI_ARGS_((Tcl_Interp *interp)); /* 124 */ + Tcl_Namespace * (*tcl_GetGlobalNamespace) _ANSI_ARGS_((Tcl_Interp *interp)); /* 125 */ + void (*tcl_GetVariableFullName) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Var variable, Tcl_Obj *objPtr)); /* 126 */ + int (*tcl_Import) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Namespace *nsPtr, CONST char *pattern, int allowOverwrite)); /* 127 */ + void (*tcl_PopCallFrame) _ANSI_ARGS_((Tcl_Interp *interp)); /* 128 */ + int (*tcl_PushCallFrame) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_CallFrame *framePtr, Tcl_Namespace *nsPtr, int isProcCallFrame)); /* 129 */ + int (*tcl_RemoveInterpResolvers) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name)); /* 130 */ + void (*tcl_SetNamespaceResolvers) _ANSI_ARGS_((Tcl_Namespace *namespacePtr, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc)); /* 131 */ + int (*tclpHasSockets) _ANSI_ARGS_((Tcl_Interp *interp)); /* 132 */ struct tm * (*tclpGetDate) _ANSI_ARGS_((TclpTime_t time, int useGMT)); /* 133 */ - size_t (*tclpStrftime) _ANSI_ARGS_((char * s, size_t maxsize, CONST char * format, CONST struct tm * t, int useGMT)); /* 134 */ + size_t (*tclpStrftime) _ANSI_ARGS_((char *s, size_t maxsize, CONST char *format, CONST struct tm *t, int useGMT)); /* 134 */ int (*tclpCheckStackSpace) _ANSI_ARGS_((void)); /* 135 */ - void *reserved136; - void *reserved137; - CONST84_RETURN char * (*tclGetEnv) _ANSI_ARGS_((CONST char * name, Tcl_DString * valuePtr)); /* 138 */ - void *reserved139; - int (*tclLooksLikeInt) _ANSI_ARGS_((CONST char * bytes, int length)); /* 140 */ - CONST84_RETURN char * (*tclpGetCwd) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_DString * cwdPtr)); /* 141 */ - int (*tclSetByteCodeFromAny) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, CompileHookProc * hookProc, ClientData clientData)); /* 142 */ - int (*tclAddLiteralObj) _ANSI_ARGS_((struct CompileEnv * envPtr, Tcl_Obj * objPtr, LiteralEntry ** litPtrPtr)); /* 143 */ - void (*tclHideLiteral) _ANSI_ARGS_((Tcl_Interp * interp, struct CompileEnv * envPtr, int index)); /* 144 */ - struct AuxDataType * (*tclGetAuxDataType) _ANSI_ARGS_((char * typeName)); /* 145 */ - TclHandle (*tclHandleCreate) _ANSI_ARGS_((VOID * ptr)); /* 146 */ + VOID *reserved136; + VOID *reserved137; + CONST84_RETURN char * (*tclGetEnv) _ANSI_ARGS_((CONST char *name, Tcl_DString *valuePtr)); /* 138 */ + VOID *reserved139; + int (*tclLooksLikeInt) _ANSI_ARGS_((CONST char *bytes, int length)); /* 140 */ + CONST84_RETURN char * (*tclpGetCwd) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_DString *cwdPtr)); /* 141 */ + int (*tclSetByteCodeFromAny) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, CompileHookProc *hookProc, ClientData clientData)); /* 142 */ + int (*tclAddLiteralObj) _ANSI_ARGS_((struct CompileEnv *envPtr, Tcl_Obj *objPtr, LiteralEntry **litPtrPtr)); /* 143 */ + void (*tclHideLiteral) _ANSI_ARGS_((Tcl_Interp *interp, struct CompileEnv *envPtr, int index)); /* 144 */ + struct AuxDataType * (*tclGetAuxDataType) _ANSI_ARGS_((char *typeName)); /* 145 */ + TclHandle (*tclHandleCreate) _ANSI_ARGS_((VOID *ptr)); /* 146 */ void (*tclHandleFree) _ANSI_ARGS_((TclHandle handle)); /* 147 */ TclHandle (*tclHandlePreserve) _ANSI_ARGS_((TclHandle handle)); /* 148 */ void (*tclHandleRelease) _ANSI_ARGS_((TclHandle handle)); /* 149 */ - int (*tclRegAbout) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_RegExp re)); /* 150 */ - void (*tclRegExpRangeUniChar) _ANSI_ARGS_((Tcl_RegExp re, int index, int * startPtr, int * endPtr)); /* 151 */ - void (*tclSetLibraryPath) _ANSI_ARGS_((Tcl_Obj * pathPtr)); /* 152 */ + int (*tclRegAbout) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_RegExp re)); /* 150 */ + void (*tclRegExpRangeUniChar) _ANSI_ARGS_((Tcl_RegExp re, int index, int *startPtr, int *endPtr)); /* 151 */ + void (*tclSetLibraryPath) _ANSI_ARGS_((Tcl_Obj *pathPtr)); /* 152 */ Tcl_Obj * (*tclGetLibraryPath) _ANSI_ARGS_((void)); /* 153 */ - void *reserved154; - void *reserved155; - void (*tclRegError) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * msg, int status)); /* 156 */ - Var * (*tclVarTraceExists) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * varName)); /* 157 */ - void (*tclSetStartupScriptFileName) _ANSI_ARGS_((CONST char * filename)); /* 158 */ + VOID *reserved154; + VOID *reserved155; + void (*tclRegError) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *msg, int status)); /* 156 */ + Var * (*tclVarTraceExists) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *varName)); /* 157 */ + void (*tclSetStartupScriptFileName) _ANSI_ARGS_((CONST char *filename)); /* 158 */ CONST84_RETURN char * (*tclGetStartupScriptFileName) _ANSI_ARGS_((void)); /* 159 */ - void *reserved160; - int (*tclChannelTransform) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan, Tcl_Obj * cmdObjPtr)); /* 161 */ + VOID *reserved160; + int (*tclChannelTransform) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Channel chan, Tcl_Obj *cmdObjPtr)); /* 161 */ void (*tclChannelEventScriptInvoker) _ANSI_ARGS_((ClientData clientData, int flags)); /* 162 */ VOID * (*tclGetInstructionTable) _ANSI_ARGS_((void)); /* 163 */ - void (*tclExpandCodeArray) _ANSI_ARGS_((VOID * envPtr)); /* 164 */ + void (*tclExpandCodeArray) _ANSI_ARGS_((VOID *envPtr)); /* 164 */ void (*tclpSetInitialEncodings) _ANSI_ARGS_((void)); /* 165 */ - int (*tclListObjSetElement) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int index, Tcl_Obj * valuePtr)); /* 166 */ - void (*tclSetStartupScriptPath) _ANSI_ARGS_((Tcl_Obj * pathPtr)); /* 167 */ + int (*tclListObjSetElement) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *listPtr, int index, Tcl_Obj *valuePtr)); /* 166 */ + void (*tclSetStartupScriptPath) _ANSI_ARGS_((Tcl_Obj *pathPtr)); /* 167 */ Tcl_Obj * (*tclGetStartupScriptPath) _ANSI_ARGS_((void)); /* 168 */ - int (*tclpUtfNcmp2) _ANSI_ARGS_((CONST char * s1, CONST char * s2, unsigned long n)); /* 169 */ - int (*tclCheckInterpTraces) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * command, int numChars, Command * cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *CONST objv[])); /* 170 */ - int (*tclCheckExecutionTraces) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * command, int numChars, Command * cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *CONST objv[])); /* 171 */ + int (*tclpUtfNcmp2) _ANSI_ARGS_((CONST char *s1, CONST char *s2, unsigned long n)); /* 169 */ + int (*tclCheckInterpTraces) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *command, int numChars, Command *cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *CONST objv[])); /* 170 */ + int (*tclCheckExecutionTraces) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *command, int numChars, Command *cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *CONST objv[])); /* 171 */ int (*tclInThreadExit) _ANSI_ARGS_((void)); /* 172 */ - int (*tclUniCharMatch) _ANSI_ARGS_((CONST Tcl_UniChar * string, int strLen, CONST Tcl_UniChar * pattern, int ptnLen, int nocase)); /* 173 */ - void *reserved174; - void *reserved175; - void *reserved176; - void *reserved177; - void *reserved178; - void *reserved179; - void *reserved180; - void *reserved181; + int (*tclUniCharMatch) _ANSI_ARGS_((CONST Tcl_UniChar *string, int strLen, CONST Tcl_UniChar *pattern, int ptnLen, int nocase)); /* 173 */ + VOID *reserved174; + VOID *reserved175; + VOID *reserved176; + VOID *reserved177; + VOID *reserved178; + VOID *reserved179; + VOID *reserved180; + VOID *reserved181; struct tm * (*tclpLocaltime) _ANSI_ARGS_((TclpTime_t_CONST clock)); /* 182 */ struct tm * (*tclpGmtime) _ANSI_ARGS_((TclpTime_t_CONST clock)); /* 183 */ - void *reserved184; - void *reserved185; - void *reserved186; - void *reserved187; - void *reserved188; - void *reserved189; - void *reserved190; - void *reserved191; - void *reserved192; - void *reserved193; - void *reserved194; - void *reserved195; - void *reserved196; - void *reserved197; - void *reserved198; - int (*tclMatchIsTrivial) _ANSI_ARGS_((CONST char * pattern)); /* 199 */ + VOID *reserved184; + VOID *reserved185; + VOID *reserved186; + VOID *reserved187; + VOID *reserved188; + VOID *reserved189; + VOID *reserved190; + VOID *reserved191; + VOID *reserved192; + VOID *reserved193; + VOID *reserved194; + VOID *reserved195; + VOID *reserved196; + VOID *reserved197; + VOID *reserved198; + int (*tclMatchIsTrivial) _ANSI_ARGS_((CONST char *pattern)); /* 199 */ } TclIntStubs; #ifdef __cplusplus diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 3a4123b..7ce711d 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -50,12 +50,12 @@ EXTERN Tcl_Channel TclpCreateCommandChannel _ANSI_ARGS_(( EXTERN int TclpCreatePipe _ANSI_ARGS_((TclFile *readPipe, TclFile *writePipe)); /* 4 */ -EXTERN void * TclWinGetTclInstance _ANSI_ARGS_((void)); +EXTERN VOID * TclWinGetTclInstance _ANSI_ARGS_((void)); /* Slot 5 is reserved */ /* 6 */ EXTERN unsigned short TclWinNToHS _ANSI_ARGS_((unsigned short ns)); /* 7 */ -EXTERN int TclWinSetSockOpt _ANSI_ARGS_((void *s, int level, +EXTERN int TclWinSetSockOpt _ANSI_ARGS_((VOID *s, int level, int optname, CONST char *optval, int optlen)); /* 8 */ EXTERN int TclUnixWaitForFile _ANSI_ARGS_((int fd, int mask, @@ -85,15 +85,14 @@ EXTERN int TclMacOSXMatchType _ANSI_ARGS_((Tcl_Interp *interp, Tcl_GlobTypeData *types)); /* 19 */ EXTERN void TclMacOSXNotifierAddRunLoopMode _ANSI_ARGS_(( - CONST void *runLoopMode)); + CONST VOID *runLoopMode)); /* 20 */ -EXTERN void TclWinAddProcess _ANSI_ARGS_((void *hProcess, +EXTERN void TclWinAddProcess _ANSI_ARGS_((VOID *hProcess, unsigned int id)); /* Slot 21 is reserved */ /* 22 */ EXTERN TclFile TclpCreateTempFile _ANSI_ARGS_((CONST char *contents)); -/* 23 */ -EXTERN char * TclpGetTZName _ANSI_ARGS_((int isdst)); +/* Slot 23 is reserved */ /* 24 */ EXTERN char * TclWinNoBackslash _ANSI_ARGS_((char *path)); /* Slot 25 is reserved */ @@ -264,28 +263,28 @@ typedef struct TclIntPlatStubs { 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 */ - void * (*tclWinGetTclInstance) _ANSI_ARGS_((void)); /* 4 */ - void *reserved5; + VOID * (*tclWinGetTclInstance) _ANSI_ARGS_((void)); /* 4 */ + VOID *reserved5; unsigned short (*tclWinNToHS) _ANSI_ARGS_((unsigned short ns)); /* 6 */ - int (*tclWinSetSockOpt) _ANSI_ARGS_((void *s, int level, int optname, CONST char *optval, int optlen)); /* 7 */ + int (*tclWinSetSockOpt) _ANSI_ARGS_((VOID *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 */ 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 *reserved14; int (*tclMacOSXGetFileAttribute) _ANSI_ARGS_((Tcl_Interp *interp, int objIndex, Tcl_Obj *fileName, Tcl_Obj **attributePtrPtr)); /* 15 */ - void *reserved16; - void *reserved17; + VOID *reserved16; + VOID *reserved17; 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 int id)); /* 20 */ - void *reserved21; + void (*tclMacOSXNotifierAddRunLoopMode) _ANSI_ARGS_((CONST VOID *runLoopMode)); /* 19 */ + void (*tclWinAddProcess) _ANSI_ARGS_((VOID *hProcess, unsigned int id)); /* 20 */ + VOID *reserved21; TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char *contents)); /* 22 */ - char * (*tclpGetTZName) _ANSI_ARGS_((int isdst)); /* 23 */ + VOID *reserved23; char * (*tclWinNoBackslash) _ANSI_ARGS_((char *path)); /* 24 */ - void *reserved25; + VOID *reserved25; void (*tclWinSetInterfaces) _ANSI_ARGS_((int wide)); /* 26 */ void (*tclWinFlushDirtyChannels) _ANSI_ARGS_((void)); /* 27 */ void (*tclWinResetInterfaces) _ANSI_ARGS_((void)); /* 28 */ @@ -299,23 +298,23 @@ typedef struct TclIntPlatStubs { struct servent * (*tclWinGetServByName) _ANSI_ARGS_((CONST char *nm, CONST char *proto)); /* 2 */ int (*tclWinGetSockOpt) _ANSI_ARGS_((SOCKET s, int level, int optname, char *optval, int *optlen)); /* 3 */ HINSTANCE (*tclWinGetTclInstance) _ANSI_ARGS_((void)); /* 4 */ - void *reserved5; + VOID *reserved5; u_short (*tclWinNToHS) _ANSI_ARGS_((u_short ns)); /* 6 */ int (*tclWinSetSockOpt) _ANSI_ARGS_((SOCKET s, int level, int optname, CONST char *optval, int optlen)); /* 7 */ unsigned long (*tclpGetPid) _ANSI_ARGS_((Tcl_Pid pid)); /* 8 */ int (*tclWinGetPlatformId) _ANSI_ARGS_((void)); /* 9 */ - void *reserved10; + 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 *reserved16; - void *reserved17; + 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 */ - void *reserved21; + VOID *reserved21; TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char *contents)); /* 22 */ char * (*tclpGetTZName) _ANSI_ARGS_((int isdst)); /* 23 */ char * (*tclWinNoBackslash) _ANSI_ARGS_((char *path)); /* 24 */ @@ -448,10 +447,7 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr; #define TclpCreateTempFile \ (tclIntPlatStubsPtr->tclpCreateTempFile) /* 22 */ #endif -#ifndef TclpGetTZName -#define TclpGetTZName \ - (tclIntPlatStubsPtr->tclpGetTZName) /* 23 */ -#endif +/* Slot 23 is reserved */ #ifndef TclWinNoBackslash #define TclWinNoBackslash \ (tclIntPlatStubsPtr->tclWinNoBackslash) /* 24 */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 8c497288..8e8c66a 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -68,7 +68,6 @@ int __stdcall GetModuleHandleExW(unsigned int, const char *, void *); #define TclWinGetTclInstance winGetTclInstance #define TclWinNToHS winNToHS #define TclWinSetSockOpt winSetSockOpt -#define TclpGetTZName pGetTZName #define TclWinNoBackslash winNoBackslash #define TclWinSetInterfaces (void (*) (int)) doNothing #define TclWinAddProcess (void (*) (void *, unsigned int)) doNothing @@ -112,16 +111,6 @@ TclWinSetSockOpt(void *s, int level, int optname, } static char * -TclpGetTZName(int isdst) -{ - ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); - const char *zone = getenv("TZ"); - Tcl_ExternalToUtf(NULL, NULL, zone, strlen(zone), 0, NULL, - tsdPtr->tzName, sizeof(tsdPtr->tzName), NULL, NULL, NULL); - return tsdPtr->tzName; -} - -static char * TclWinNoBackslash(char *path) { char *p; @@ -186,7 +175,6 @@ Tcl_WinTCharToUtf( # define TclWinNToHS (unsigned short (*) _ANSI_ARGS_((unsigned short ns))) TclpMakeFile # define TclWinSetSockOpt (int (*) _ANSI_ARGS_((void *, int, int, const char *, int))) TclpOpenFile # define TclWinAddProcess 0 -# define TclpGetTZName 0 # define TclWinNoBackslash 0 # define TclWinSetInterfaces 0 # define TclWinFlushDirtyChannels 0 @@ -466,7 +454,7 @@ TclIntPlatStubs tclIntPlatStubs = { TclWinAddProcess, /* 20 */ NULL, /* 21 */ TclpCreateTempFile, /* 22 */ - TclpGetTZName, /* 23 */ + NULL, /* 23 */ TclWinNoBackslash, /* 24 */ NULL, /* 25 */ TclWinSetInterfaces, /* 26 */ diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl index 5e86b69..c2b0b27 100644 --- a/tools/genStubs.tcl +++ b/tools/genStubs.tcl @@ -149,6 +149,8 @@ proc genStubs::declare {args} { puts stderr "Duplicate entry: declare $args" } } + regsub -all const $decl CONST decl + regsub -all _XCONST $decl _Xconst decl regsub -all "\[ \t\n\]+" [string trim $decl] " " decl set decl [parseDecl $decl] @@ -259,7 +261,7 @@ proc genStubs::addPlatformGuard {plat text} { proc genStubs::emitSlots {name textVar} { upvar $textVar text - forAllStubs $name makeSlot 1 text {" void *reserved$i;\n"} + forAllStubs $name makeSlot 1 text {" VOID *reserved$i;\n"} return } @@ -360,6 +362,9 @@ proc genStubs::makeDecl {name decl index} { lassign $decl rtype fname args append text "/* $index */\n" + if {($rtype != "void") && ($rtype != "pascal void")} { + regsub -all void $rtype VOID rtype + } set line "EXTERN $rtype" set count [expr {2 - ([string length $line] / 8)}] append line [string range "\t\t\t" 0 $count] @@ -370,9 +375,10 @@ proc genStubs::makeDecl {name decl index} { } append line "$fname _ANSI_ARGS_(" + regsub -all void $args VOID args set arg1 [lindex $args 0] switch -exact $arg1 { - void { + VOID { append line "(void)" } TCL_VARARGS { @@ -529,11 +535,15 @@ proc genStubs::makeSlot {name decl index} { append lfname [string range $fname 1 end] set text " " + if {($rtype != "void") && ($rtype != "pascal void")} { + regsub -all void $rtype VOID rtype + } append text $rtype " (*" $lfname ") _ANSI_ARGS_(" + regsub -all void $args VOID args set arg1 [lindex $args 0] switch -exact $arg1 { - void { + VOID { append text "(void)" } TCL_VARARGS { |