diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-23 14:26:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-23 14:26:26 (GMT) |
| commit | e3a66ed89821aa0205bac733c8d1a5b45465556f (patch) | |
| tree | f8c97a09da7a63e7eef5601d049048a24448a1b4 | |
| parent | 21d713fe09d0989cd5661b02ae415537c7863826 (diff) | |
| parent | c21feb251ebe185b37d7061f8cb7c051cbdb15e8 (diff) | |
| download | tcl-e3a66ed89821aa0205bac733c8d1a5b45465556f.zip tcl-e3a66ed89821aa0205bac733c8d1a5b45465556f.tar.gz tcl-e3a66ed89821aa0205bac733c8d1a5b45465556f.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | generic/tcl.decls | 2 | ||||
| -rw-r--r-- | generic/tclDecls.h | 12 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 74f5846..185eb1a 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2325,7 +2325,7 @@ declare 630 { # ----- BASELINE -- FOR -- 8.6.0 ----- # -declare 668 { +declare 670 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 3047f1e..5f1f351 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1852,7 +1852,9 @@ EXTERN void Tcl_ZlibStreamSetCompressionDictionary( /* Slot 665 is reserved */ /* Slot 666 is reserved */ /* Slot 667 is reserved */ -/* 668 */ +/* Slot 668 is reserved */ +/* Slot 669 is reserved */ +/* 670 */ EXTERN void TclUnusedStubEntry(void); typedef struct { @@ -2557,7 +2559,9 @@ typedef struct TclStubs { void (*reserved665)(void); void (*reserved666)(void); void (*reserved667)(void); - void (*tclUnusedStubEntry) (void); /* 668 */ + void (*reserved668)(void); + void (*reserved669)(void); + void (*tclUnusedStubEntry) (void); /* 670 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -3887,8 +3891,10 @@ extern const TclStubs *tclStubsPtr; /* Slot 665 is reserved */ /* Slot 666 is reserved */ /* Slot 667 is reserved */ +/* Slot 668 is reserved */ +/* Slot 669 is reserved */ #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 668 */ + (tclStubsPtr->tclUnusedStubEntry) /* 670 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index c27e6a9..12d618c 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -1657,7 +1657,9 @@ const TclStubs tclStubs = { 0, /* 665 */ 0, /* 666 */ 0, /* 667 */ - TclUnusedStubEntry, /* 668 */ + 0, /* 668 */ + 0, /* 669 */ + TclUnusedStubEntry, /* 670 */ }; /* !END!: Do not edit above this line. */ |