diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-08-27 07:13:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-08-27 07:13:17 (GMT) |
| commit | 1ad6db680c81bf376a0846a051a14257487570c2 (patch) | |
| tree | 424180e7477f011915ce5b72cc32bb11b94ad242 /generic | |
| parent | 4d544cb15970246ab5a46c3eb24e61106517e356 (diff) | |
| parent | fdf0eab42848aced45b470262cc3507d2f9a8c5f (diff) | |
| download | tcl-1ad6db680c81bf376a0846a051a14257487570c2.zip tcl-1ad6db680c81bf376a0846a051a14257487570c2.tar.gz tcl-1ad6db680c81bf376a0846a051a14257487570c2.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclOO.decls | 2 | ||||
| -rw-r--r-- | generic/tclOODecls.h | 10 | ||||
| -rw-r--r-- | generic/tclOOStubInit.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/generic/tclOO.decls b/generic/tclOO.decls index 338abc8..ef67160 100644 --- a/generic/tclOO.decls +++ b/generic/tclOO.decls @@ -130,7 +130,7 @@ declare 29 { int Tcl_MethodIsPrivate(Tcl_Method method) } declare 31 { - void TclUnusedStubEntry(void) + void TclOOUnusedStubEntry(void) } ###################################################################### diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h index 8278a88..d3ec358 100644 --- a/generic/tclOODecls.h +++ b/generic/tclOODecls.h @@ -120,7 +120,7 @@ TCLAPI Tcl_Obj * Tcl_GetObjectName(Tcl_Interp *interp, TCLAPI int Tcl_MethodIsPrivate(Tcl_Method method); /* Slot 30 is reserved */ /* 31 */ -TCLAPI void TclUnusedStubEntry(void); +TCLAPI void TclOOUnusedStubEntry(void); typedef struct { const struct TclOOIntStubs *tclOOIntStubs; @@ -161,7 +161,7 @@ typedef struct TclOOStubs { Tcl_Obj * (*tcl_GetObjectName) (Tcl_Interp *interp, Tcl_Object object); /* 28 */ int (*tcl_MethodIsPrivate) (Tcl_Method method); /* 29 */ void (*reserved30)(void); - void (*tclUnusedStubEntry) (void); /* 31 */ + void (*tclOOUnusedStubEntry) (void); /* 31 */ } TclOOStubs; extern const TclOOStubs *tclOOStubsPtr; @@ -237,11 +237,13 @@ extern const TclOOStubs *tclOOStubsPtr; #define Tcl_MethodIsPrivate \ (tclOOStubsPtr->tcl_MethodIsPrivate) /* 29 */ /* Slot 30 is reserved */ -#define TclUnusedStubEntry \ - (tclOOStubsPtr->tclUnusedStubEntry) /* 31 */ +#define TclOOUnusedStubEntry \ + (tclOOStubsPtr->tclOOUnusedStubEntry) /* 31 */ #endif /* defined(USE_TCLOO_STUBS) */ /* !END!: Do not edit above this line. */ +#undef TclOOUnusedStubEntry + #endif /* _TCLOODECLS */ diff --git a/generic/tclOOStubInit.c b/generic/tclOOStubInit.c index ee03291..df3f07d 100644 --- a/generic/tclOOStubInit.c +++ b/generic/tclOOStubInit.c @@ -77,7 +77,7 @@ const TclOOStubs tclOOStubs = { Tcl_GetObjectName, /* 28 */ Tcl_MethodIsPrivate, /* 29 */ 0, /* 30 */ - TclUnusedStubEntry, /* 31 */ + TclOOUnusedStubEntry, /* 31 */ }; /* !END!: Do not edit above this line. */ |