diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-09 13:22:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-09 13:22:46 (GMT) |
| commit | e1b9a033d74009b6b57c6a65fe10473cd96a67dc (patch) | |
| tree | 45a1bf62fd648db3c9329cafd02c4e869a41dc5c /generic | |
| parent | d6b88eb7975e3dc13b386679c53bb4a6f7f7f616 (diff) | |
| parent | a81159df88c89e6950dff666b7e507a0285c616a (diff) | |
| download | tcl-e1b9a033d74009b6b57c6a65fe10473cd96a67dc.zip tcl-e1b9a033d74009b6b57c6a65fe10473cd96a67dc.tar.gz tcl-e1b9a033d74009b6b57c6a65fe10473cd96a67dc.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 1 | ||||
| -rw-r--r-- | generic/tclIntDecls.h | 5 | ||||
| -rw-r--r-- | generic/tclProc.c | 2 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 2 |
4 files changed, 10 insertions, 0 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 8762d26..bac9b9a 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -774,6 +774,7 @@ Tcl_CreateInterp(void) Tcl_MutexUnlock(&cancelLock); } +#undef TclObjInterpProc if (commandTypeInit == 0) { TclRegisterCommandTypeName(TclObjInterpProc, "proc"); TclRegisterCommandTypeName(TclEnsembleImplementationCmd, "ensemble"); diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 6d84844..2be46bc 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -576,6 +576,7 @@ EXTERN void TclStaticLibrary(Tcl_Interp *interp, /* 258 */ EXTERN Tcl_Obj * TclpCreateTemporaryDirectory(Tcl_Obj *dirObj, Tcl_Obj *basenameObj); +/* Slot 259 is reserved */ /* 260 */ EXTERN Tcl_Obj * TclListTestObj(int length, int leadingSpace, int endSpace); @@ -846,6 +847,7 @@ typedef struct TclIntStubs { int (*tclPtrUnsetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 256 */ void (*tclStaticLibrary) (Tcl_Interp *interp, const char *prefix, Tcl_LibraryInitProc *initProc, Tcl_LibraryInitProc *safeInitProc); /* 257 */ Tcl_Obj * (*tclpCreateTemporaryDirectory) (Tcl_Obj *dirObj, Tcl_Obj *basenameObj); /* 258 */ + void (*reserved259)(void); Tcl_Obj * (*tclListTestObj) (int length, int leadingSpace, int endSpace); /* 260 */ void (*tclListObjValidate) (Tcl_Interp *interp, Tcl_Obj *listObj); /* 261 */ } TclIntStubs; @@ -1262,6 +1264,7 @@ extern const TclIntStubs *tclIntStubsPtr; (tclIntStubsPtr->tclStaticLibrary) /* 257 */ #define TclpCreateTemporaryDirectory \ (tclIntStubsPtr->tclpCreateTemporaryDirectory) /* 258 */ +/* Slot 259 is reserved */ #define TclListTestObj \ (tclIntStubsPtr->tclListTestObj) /* 260 */ #define TclListObjValidate \ @@ -1276,6 +1279,8 @@ extern const TclIntStubs *tclIntStubsPtr; #define Tcl_StaticLibrary \ (tclIntStubsPtr->tclStaticLibrary) #endif /* defined(USE_TCL_STUBS) */ +#undef TclObjInterpProc +#define TclObjInterpProc TclGetObjInterpProc() #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT diff --git a/generic/tclProc.c b/generic/tclProc.c index ad1aa93..b846269 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -148,6 +148,7 @@ static const Tcl_ObjType lambdaType = { *---------------------------------------------------------------------- */ +#undef TclObjInterpProc int Tcl_ProcObjCmd( TCL_UNUSED(void *), @@ -1594,6 +1595,7 @@ TclPushProcCallFrame( *---------------------------------------------------------------------- */ +#undef TclObjInterpProc int TclObjInterpProc( ClientData clientData, /* Record describing procedure to be diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index fc30c22..a00e835 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -67,6 +67,7 @@ #undef Tcl_UtfToUniCharDString #undef Tcl_UtfToUniChar #undef Tcl_UniCharLen +#undef TclObjInterpProc #if !defined(_WIN32) && !defined(__CYGWIN__) #undef Tcl_WinConvertError #define Tcl_WinConvertError 0 @@ -650,6 +651,7 @@ static const TclIntStubs tclIntStubs = { TclPtrUnsetVar, /* 256 */ TclStaticLibrary, /* 257 */ TclpCreateTemporaryDirectory, /* 258 */ + 0, /* 259 */ TclListTestObj, /* 260 */ TclListObjValidate, /* 261 */ }; |