Merge 8.6 (no need for TclUnusedStubEntry here)

3 files changed, 5 insertions, 11 deletions

diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 7828872..8d9ef6c 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -1025,6 +1025,7 @@ declare 256 {
     int	TclPtrUnsetVar(Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr,
 	    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags)
 }
+
 declare 257 {
     void TclStaticLibrary(Tcl_Interp *interp, const char *prefix,
 	    Tcl_LibraryInitProc *initProc, Tcl_LibraryInitProc *safeInitProc)
@@ -1036,10 +1037,6 @@ declare 258 {
 	    Tcl_Obj *basenameObj)
 }
 
-declare 259 {
-    void TclUnusedStubEntry(void)
-}
-
 # TIP 625: for unit testing - create list objects with span
 declare 260 {
     Tcl_Obj *TclListTestObj(int length, int leadingSpace, int endSpace)
@@ -1049,7 +1046,6 @@ declare 260 {
 declare 261 {
     void TclListObjValidate(Tcl_Interp *interp, Tcl_Obj *listObj)
 }
-
 
 ##############################################################################
 
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 5d728a0..69aee7c 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -656,8 +656,7 @@ EXTERN void		TclStaticLibrary(Tcl_Interp *interp,
 /* 258 */
 EXTERN Tcl_Obj *	TclpCreateTemporaryDirectory(Tcl_Obj *dirObj,
 				Tcl_Obj *basenameObj);
-/* 259 */
-EXTERN void		TclUnusedStubEntry(void);
+/* Slot 259 is reserved */
 /* 260 */
 EXTERN Tcl_Obj *	TclListTestObj(int length, int leadingSpace,
 				int endSpace);
@@ -928,7 +927,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 (*tclUnusedStubEntry) (void); /* 259 */
+    void (*reserved259)(void);
     Tcl_Obj * (*tclListTestObj) (int length, int leadingSpace, int endSpace); /* 260 */
     void (*tclListObjValidate) (Tcl_Interp *interp, Tcl_Obj *listObj); /* 261 */
 } TclIntStubs;
@@ -1376,8 +1375,7 @@ extern const TclIntStubs *tclIntStubsPtr;
 	(tclIntStubsPtr->tclStaticLibrary) /* 257 */
 #define TclpCreateTemporaryDirectory \
 	(tclIntStubsPtr->tclpCreateTemporaryDirectory) /* 258 */
-#define TclUnusedStubEntry \
-	(tclIntStubsPtr->tclUnusedStubEntry) /* 259 */
+/* Slot 259 is reserved */
 #define TclListTestObj \
 	(tclIntStubsPtr->tclListTestObj) /* 260 */
 #define TclListObjValidate \
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index a067668..87c9d0a 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -1118,7 +1118,7 @@ static const TclIntStubs tclIntStubs = {
     TclPtrUnsetVar, /* 256 */
     TclStaticLibrary, /* 257 */
     TclpCreateTemporaryDirectory, /* 258 */
-    TclUnusedStubEntry, /* 259 */
+    0, /* 259 */
     TclListTestObj, /* 260 */
     TclListObjValidate, /* 261 */
 };