diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-04-15 19:11:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-04-15 19:11:35 (GMT) |
| commit | f64db5dae2e12baca81dd2c44fa12194214a8bb5 (patch) | |
| tree | d3e5281b5188733a70304934b1968b2ef3919884 | |
| parent | f82e6059dce38a482b9db9366d2edf71cb5ea917 (diff) | |
| parent | 52425dcf5d50616645b90e2acee65ef733962afa (diff) | |
| download | tcl-f64db5dae2e12baca81dd2c44fa12194214a8bb5.zip tcl-f64db5dae2e12baca81dd2c44fa12194214a8bb5.tar.gz tcl-f64db5dae2e12baca81dd2c44fa12194214a8bb5.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tcl.decls | 2 | ||||
| -rw-r--r-- | generic/tclDecls.h | 9 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 3 | ||||
| -rw-r--r-- | unix/Makefile.in | 3 |
4 files changed, 10 insertions, 7 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 4e8f20a..a89e64f 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2569,7 +2569,7 @@ declare 685 { # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # -declare 687 { +declare 688 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index e2901fb..c5c7526 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -2050,7 +2050,8 @@ EXTERN int Tcl_GetWideUIntFromObj(Tcl_Interp *interp, /* 685 */ EXTERN Tcl_Obj * Tcl_DStringToObj(Tcl_DString *dsPtr); /* Slot 686 is reserved */ -/* 687 */ +/* Slot 687 is reserved */ +/* 688 */ EXTERN void TclUnusedStubEntry(void); typedef struct { @@ -2774,7 +2775,8 @@ typedef struct TclStubs { int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */ Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */ void (*reserved686)(void); - void (*tclUnusedStubEntry) (void); /* 687 */ + void (*reserved687)(void); + void (*tclUnusedStubEntry) (void); /* 688 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -4178,8 +4180,9 @@ extern const TclStubs *tclStubsPtr; #define Tcl_DStringToObj \ (tclStubsPtr->tcl_DStringToObj) /* 685 */ /* Slot 686 is reserved */ +/* Slot 687 is reserved */ #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 687 */ + (tclStubsPtr->tclUnusedStubEntry) /* 688 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index ddc0bc9..bab1935 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -2058,7 +2058,8 @@ const TclStubs tclStubs = { Tcl_GetWideUIntFromObj, /* 684 */ Tcl_DStringToObj, /* 685 */ 0, /* 686 */ - TclUnusedStubEntry, /* 687 */ + 0, /* 687 */ + TclUnusedStubEntry, /* 688 */ }; /* !END!: Do not edit above this line. */ diff --git a/unix/Makefile.in b/unix/Makefile.in index 614072f..e092a2d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -151,8 +151,7 @@ SHELL = @MAKEFILE_SHELL@ # distribution, which is slower but guaranteed to work. INSTALL_STRIP_PROGRAM = -s -# Use --strip-unneeded instead of -x. See issue 718de2132f487cf2 -INSTALL_STRIP_LIBRARY = -S --strip-unneeded +INSTALL_STRIP_LIBRARY = -S -x INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c INSTALL_PROGRAM = ${INSTALL} |