diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-22 20:11:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-22 20:11:58 (GMT) |
| commit | 95cac7dd26d2b23d70c775b30229fd342cee2bf1 (patch) | |
| tree | 838c34a5b71bb216c84baebb77e0bf7721386564 | |
| parent | 124340611ed97ad4347b3ce4bc6aa1d76a99f1b0 (diff) | |
| parent | eddb2b2801aceda76f3fef6cbcd93c2b1241f165 (diff) | |
| download | tcl-95cac7dd26d2b23d70c775b30229fd342cee2bf1.zip tcl-95cac7dd26d2b23d70c775b30229fd342cee2bf1.tar.gz tcl-95cac7dd26d2b23d70c775b30229fd342cee2bf1.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | generic/tcl.decls | 4 | ||||
| -rw-r--r-- | generic/tclDecls.h | 18 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 6 |
3 files changed, 23 insertions, 5 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 241839e..d20a945 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2326,10 +2326,12 @@ declare 630 { # ----- BASELINE -- FOR -- 8.6.0 ----- # -declare 683 { +declare 687 { void TclUnusedStubEntry(void) } +# ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # + ############################################################################## # Define the platform specific public Tcl interface. These functions are only diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 9e3f9de..6723069 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1867,7 +1867,11 @@ EXTERN void Tcl_ZlibStreamSetCompressionDictionary( /* Slot 680 is reserved */ /* Slot 681 is reserved */ /* Slot 682 is reserved */ -/* 683 */ +/* Slot 683 is reserved */ +/* Slot 684 is reserved */ +/* Slot 685 is reserved */ +/* Slot 686 is reserved */ +/* 687 */ EXTERN void TclUnusedStubEntry(void); typedef struct { @@ -2587,7 +2591,11 @@ typedef struct TclStubs { void (*reserved680)(void); void (*reserved681)(void); void (*reserved682)(void); - void (*tclUnusedStubEntry) (void); /* 683 */ + void (*reserved683)(void); + void (*reserved684)(void); + void (*reserved685)(void); + void (*reserved686)(void); + void (*tclUnusedStubEntry) (void); /* 687 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -3932,8 +3940,12 @@ extern const TclStubs *tclStubsPtr; /* Slot 680 is reserved */ /* Slot 681 is reserved */ /* Slot 682 is reserved */ +/* Slot 683 is reserved */ +/* Slot 684 is reserved */ +/* Slot 685 is reserved */ +/* Slot 686 is reserved */ #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 683 */ + (tclStubsPtr->tclUnusedStubEntry) /* 687 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 04299b1..89a33e4 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -1676,7 +1676,11 @@ const TclStubs tclStubs = { 0, /* 680 */ 0, /* 681 */ 0, /* 682 */ - TclUnusedStubEntry, /* 683 */ + 0, /* 683 */ + 0, /* 684 */ + 0, /* 685 */ + 0, /* 686 */ + TclUnusedStubEntry, /* 687 */ }; /* !END!: Do not edit above this line. */ |