Remove unneeded internal stub-entries (now that TIP #666 is accepted)

5 files changed, 29 insertions, 494 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 58b7400..2f21fa5 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -143,7 +143,7 @@ declare 32 {
 	    int *intPtr)
 }
 declare 33 {
-    unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, int *lengthPtr)
+    unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, int *numBytesPtr)
 }
 declare 34 {
     int Tcl_GetDouble(Tcl_Interp *interp, const char *src, double *doublePtr)
@@ -202,7 +202,7 @@ declare 49 {
     Tcl_Obj *Tcl_NewBooleanObj(int intValue)
 }
 declare 50 {
-    Tcl_Obj *Tcl_NewByteArrayObj(const unsigned char *bytes, int length)
+    Tcl_Obj *Tcl_NewByteArrayObj(const unsigned char *bytes, int numBytes)
 }
 declare 51 {
     Tcl_Obj *Tcl_NewDoubleObj(double doubleValue)
@@ -598,8 +598,8 @@ declare 166 {
 # generic interface, so we include it here for compatibility reasons.
 
 declare 167 unix {
-    int Tcl_GetOpenFile(Tcl_Interp *interp, const char *chanID, int forWriting,
-	    int checkUsage, ClientData *filePtr)
+    int Tcl_GetOpenFile(Tcl_Interp *interp, const char *chanID,
+	    int forWriting, int checkUsage, ClientData *filePtr)
 }
 # Obsolete.  Should now use Tcl_FSGetPathType which is objectified
 # and therefore usually faster.
@@ -2138,8 +2138,8 @@ declare 584 {
     int Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags)
 }
 declare 585 {
-    int Tcl_NREvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
-	    int flags)
+    int Tcl_NREvalObjv(Tcl_Interp *interp, int objc,
+	    Tcl_Obj *const objv[], int flags)
 }
 declare 586 {
     int Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd, int objc,
@@ -2272,7 +2272,8 @@ declare 618 {
     int Tcl_ZlibStreamPut(Tcl_ZlibStream zshandle, Tcl_Obj *data, int flush)
 }
 declare 619 {
-    int Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle, Tcl_Obj *data, int count)
+    int Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle, Tcl_Obj *data,
+	    int count)
 }
 declare 620 {
     int Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle)
@@ -2326,19 +2327,6 @@ declare 630 {
 
 # ----- BASELINE -- FOR -- 8.6.0 ----- #
 
-# (unsupported in Tcl 8.6)
-declare 651 {
-    char *TclGetStringFromObj_(Tcl_Obj *objPtr, void *lengthPtr)
-}
-declare 652 {
-    unsigned short *TclGetUnicodeFromObj_(Tcl_Obj *objPtr, void *lengthPtr)
-}
-declare 653 {
-    unsigned char *TclGetByteArrayFromObj_(Tcl_Obj *objPtr, void *numBytesPtr)
-}
-
-# ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
-
 declare 688 {
     void TclUnusedStubEntry(void)
 }
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 207f3af..f262b37 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -1183,18 +1183,10 @@ TclReleaseByteCode(
 MODULE_SCOPE void	TclReleaseLiteral(Tcl_Interp *interp, Tcl_Obj *objPtr);
 MODULE_SCOPE void	TclInvalidateCmdLiteral(Tcl_Interp *interp,
 			    const char *name, Namespace *nsPtr);
-MODULE_SCOPE int	TclSingleOpCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclSortingOpCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclVariadicOpCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclNoIdentOpCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclSingleOpCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclSortingOpCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclVariadicOpCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclNoIdentOpCmd;
 #ifdef TCL_COMPILE_DEBUG
 MODULE_SCOPE void	TclVerifyGlobalLiteralTable(Interp *iPtr);
 MODULE_SCOPE void	TclVerifyLocalLiteralTable(CompileEnv *envPtr);
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index f7641cd..8a226a9 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -141,7 +141,7 @@ EXTERN int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *intPtr);
 /* 33 */
 EXTERN unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
-				int *lengthPtr);
+				int *numBytesPtr);
 /* 34 */
 EXTERN int		Tcl_GetDouble(Tcl_Interp *interp, const char *src,
 				double *doublePtr);
@@ -193,7 +193,7 @@ EXTERN int		Tcl_ListObjReplace(Tcl_Interp *interp,
 EXTERN Tcl_Obj *	Tcl_NewBooleanObj(int intValue);
 /* 50 */
 EXTERN Tcl_Obj *	Tcl_NewByteArrayObj(const unsigned char *bytes,
-				int length);
+				int numBytes);
 /* 51 */
 EXTERN Tcl_Obj *	Tcl_NewDoubleObj(double doubleValue);
 /* 52 */
@@ -1835,15 +1835,9 @@ EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
 /* Slot 648 is reserved */
 /* Slot 649 is reserved */
 /* Slot 650 is reserved */
-/* 651 */
-EXTERN char *		TclGetStringFromObj_(Tcl_Obj *objPtr,
-				void *lengthPtr);
-/* 652 */
-EXTERN unsigned short *	 TclGetUnicodeFromObj_(Tcl_Obj *objPtr,
-				void *lengthPtr);
-/* 653 */
-EXTERN unsigned char *	TclGetByteArrayFromObj_(Tcl_Obj *objPtr,
-				void *numBytesPtr);
+/* Slot 651 is reserved */
+/* Slot 652 is reserved */
+/* Slot 653 is reserved */
 /* Slot 654 is reserved */
 /* Slot 655 is reserved */
 /* Slot 656 is reserved */
@@ -1940,7 +1934,7 @@ typedef struct TclStubs {
     void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */
     int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, int *intPtr); /* 31 */
     int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr); /* 32 */
-    unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 33 */
+    unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, int *numBytesPtr); /* 33 */
     int (*tcl_GetDouble) (Tcl_Interp *interp, const char *src, double *doublePtr); /* 34 */
     int (*tcl_GetDoubleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr); /* 35 */
     int (*tcl_GetIndexFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, CONST84 char *const *tablePtr, const char *msg, int flags, int *indexPtr); /* 36 */
@@ -1957,7 +1951,7 @@ typedef struct TclStubs {
     int (*tcl_ListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *lengthPtr); /* 47 */
     int (*tcl_ListObjReplace) (Tcl_Interp *interp, Tcl_Obj *listPtr, int first, int count, int objc, Tcl_Obj *const objv[]); /* 48 */
     Tcl_Obj * (*tcl_NewBooleanObj) (int intValue); /* 49 */
-    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char *bytes, int length); /* 50 */
+    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char *bytes, int numBytes); /* 50 */
     Tcl_Obj * (*tcl_NewDoubleObj) (double doubleValue); /* 51 */
     Tcl_Obj * (*tcl_NewIntObj) (int intValue); /* 52 */
     Tcl_Obj * (*tcl_NewListObj) (int objc, Tcl_Obj *const objv[]); /* 53 */
@@ -2566,9 +2560,9 @@ typedef struct TclStubs {
     void (*reserved648)(void);
     void (*reserved649)(void);
     void (*reserved650)(void);
-    char * (*tclGetStringFromObj_) (Tcl_Obj *objPtr, void *lengthPtr); /* 651 */
-    unsigned short * (*tclGetUnicodeFromObj_) (Tcl_Obj *objPtr, void *lengthPtr); /* 652 */
-    unsigned char * (*tclGetByteArrayFromObj_) (Tcl_Obj *objPtr, void *numBytesPtr); /* 653 */
+    void (*reserved651)(void);
+    void (*reserved652)(void);
+    void (*reserved653)(void);
     void (*reserved654)(void);
     void (*reserved655)(void);
     void (*reserved656)(void);
@@ -3916,12 +3910,9 @@ extern const TclStubs *tclStubsPtr;
 /* Slot 648 is reserved */
 /* Slot 649 is reserved */
 /* Slot 650 is reserved */
-#define TclGetStringFromObj_ \
-	(tclStubsPtr->tclGetStringFromObj_) /* 651 */
-#define TclGetUnicodeFromObj_ \
-	(tclStubsPtr->tclGetUnicodeFromObj_) /* 652 */
-#define TclGetByteArrayFromObj_ \
-	(tclStubsPtr->tclGetByteArrayFromObj_) /* 653 */
+/* Slot 651 is reserved */
+/* Slot 652 is reserved */
+/* Slot 653 is reserved */
 /* Slot 654 is reserved */
 /* Slot 655 is reserved */
 /* Slot 656 is reserved */
@@ -3996,9 +3987,6 @@ extern const TclStubs *tclStubsPtr;
 
 #undef Tcl_SeekOld
 #undef Tcl_TellOld
-#undef TclGetStringFromObj_
-#undef TclGetUnicodeFromObj_
-#undef TclGetByteArrayFromObj_
 
 #undef Tcl_PkgPresent
 #define Tcl_PkgPresent(interp, name, version, exact) \
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index c75c2e1..ca122f7 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -24,23 +24,9 @@ scspec EXTERN
 # Use at your own risk.  Note that the position of functions should not
 # be changed between versions to avoid gratuitous incompatibilities.
 
-# Replaced by Tcl_FSAccess in 8.4:
-#declare 0 {
-#    int TclAccess(const char *path, int mode)
-#}
-#declare 1 {
-#    int TclAccessDeleteProc(TclAccessProc_ *proc)
-#}
-#declare 2 {
-#    int TclAccessInsertProc(TclAccessProc_ *proc)
-#}
 declare 3 {
     void TclAllocateFreeObjects(void)
 }
-# Replaced by TclpChdir in 8.1:
-#  declare 4 {
-#      int TclChdir(Tcl_Interp *interp, char *dirName)
-#  }
 declare 5 {
     int TclCleanupChildren(Tcl_Interp *interp, int numPids, Tcl_Pid *pidPtr,
 	    Tcl_Channel errorChan)
@@ -57,7 +43,6 @@ declare 8 {
 }
 
 # TclCreatePipeline unofficially exported for use by BLT.
-
 declare 9 {
     int TclCreatePipeline(Tcl_Interp *interp, int argc, const char **argv,
 	    Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr,
@@ -74,37 +59,12 @@ declare 11 {
 declare 12 {
     void TclDeleteVars(Interp *iPtr, TclVarHashTable *tablePtr)
 }
-# Removed in 8.5:
-#declare 13 {
-#    int TclDoGlob(Tcl_Interp *interp, char *separators,
-#	    Tcl_DString *headPtr, char *tail, Tcl_GlobTypeData *types)
-#}
 declare 14 {
     int TclDumpMemoryInfo(ClientData clientData, int flags)
 }
-# Removed in 8.1:
-#  declare 15 {
-#      void TclExpandParseValue(ParseValue *pvPtr, int needed)
-#  }
 declare 16 {
     void TclExprFloatError(Tcl_Interp *interp, double value)
 }
-# Removed in 8.4:
-#declare 17 {
-#    int TclFileAttrsCmd(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
-#}
-#declare 18 {
-#    int TclFileCopyCmd(Tcl_Interp *interp, int argc, char **argv)
-#}
-#declare 19 {
-#    int TclFileDeleteCmd(Tcl_Interp *interp, int argc, char **argv)
-#}
-#declare 20 {
-#    int TclFileMakeDirsCmd(Tcl_Interp *interp, int argc, char **argv)
-#}
-#declare 21 {
-#    int TclFileRenameCmd(Tcl_Interp *interp, int argc, char **argv)
-#}
 declare 22 {
     int TclFindElement(Tcl_Interp *interp, const char *listStr,
 	    int listLength, const char **elementPtr, const char **nextPtr,
@@ -120,27 +80,9 @@ declare 24 {
 declare 25 {
     void TclFreePackageInfo(Interp *iPtr)
 }
-# Removed in 8.1:
-#  declare 26 {
-#      char *TclGetCwd(Tcl_Interp *interp)
-#  }
-# Removed in 8.5:
-#declare 27 {
-#    int TclGetDate(char *p, unsigned long now, long zone,
-#	    unsigned long *timePtr)
-#}
 declare 28 {
     Tcl_Channel TclpGetDefaultStdChannel(int type)
 }
-# Removed in 8.4b2:
-#declare 29 {
-#    Tcl_Obj *TclGetElementOfIndexedArray(Tcl_Interp *interp,
-#	    int localIndex, Tcl_Obj *elemPtr, int flags)
-#}
-# Replaced by char *TclGetEnv(const char *name, Tcl_DString *valuePtr) in 8.1:
-#  declare 30 {
-#      char *TclGetEnv(const char *name)
-#  }
 declare 31 {
     const char *TclGetExtension(const char *name)
 }
@@ -148,23 +90,10 @@ declare 32 {
     int TclGetFrame(Tcl_Interp *interp, const char *str,
 	    CallFrame **framePtrPtr)
 }
-# Removed in 8.5:
-#declare 33 {
-#    TclCmdProcType TclGetInterpProc(void)
-#}
 declare 34 {
     int TclGetIntForIndex(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    int endValue, int *indexPtr)
 }
-# Removed in 8.4b2:
-#declare 35 {
-#    Tcl_Obj *TclGetIndexedScalar(Tcl_Interp *interp, int localIndex,
-#	    int flags)
-#}
-# Removed in 8.6a2
-#declare 36 {
-#    int TclGetLong(Tcl_Interp *interp, const char *str, long *longPtr)
-#}
 declare 37 {
     int TclGetLoadedPackages(Tcl_Interp *interp, const char *targetName)
 }
@@ -186,11 +115,6 @@ declare 41 {
 declare 42 {
     CONST86 char *TclpGetUserHome(const char *name, Tcl_DString *bufferPtr)
 }
-# Removed in 8.5a2:
-#declare 43 {
-#    int TclGlobalInvoke(Tcl_Interp *interp, int argc, const char **argv,
-#	    int flags)
-#}
 declare 44 {
     int TclGuessPackageName(const char *fileName, Tcl_DString *bufPtr)
 }
@@ -200,20 +124,6 @@ declare 45 {
 declare 46 {
     int TclInExit(void)
 }
-# Removed in 8.4b2:
-#declare 47 {
-#    Tcl_Obj *TclIncrElementOfIndexedArray(Tcl_Interp *interp,
-#	    int localIndex, Tcl_Obj *elemPtr, long incrAmount)
-#}
-# Removed in 8.4b2:
-#declare 48 {
-#    Tcl_Obj *TclIncrIndexedScalar(Tcl_Interp *interp, int localIndex,
-#	    long incrAmount)
-#}
-#declare 49 {
-#    Tcl_Obj *TclIncrVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
-#	    Tcl_Obj *part2Ptr, long incrAmount, int part1NotParsed)
-#}
 declare 50 {
     void TclInitCompiledLocals(Tcl_Interp *interp, CallFrame *framePtr,
 	    Namespace *nsPtr)
@@ -221,11 +131,6 @@ declare 50 {
 declare 51 {
     int TclInterpInit(Tcl_Interp *interp)
 }
-# Removed in 8.5a2:
-#declare 52 {
-#    int TclInvoke(Tcl_Interp *interp, int argc, const char **argv,
-#	    int flags)
-#}
 declare 53 {
     int TclInvokeObjectCommand(ClientData clientData, Tcl_Interp *interp,
 	    int argc, CONST84 char **argv)
@@ -237,26 +142,11 @@ declare 54 {
 declare 55 {
     Proc *TclIsProc(Command *cmdPtr)
 }
-# Replaced with TclpLoadFile in 8.1:
-#  declare 56 {
-#      int TclLoadFile(Tcl_Interp *interp, char *fileName, char *sym1,
-#  	    char *sym2, Tcl_PackageInitProc **proc1Ptr,
-#  	    Tcl_PackageInitProc **proc2Ptr)
-#  }
-# Signature changed to take a length in 8.1:
-#  declare 57 {
-#      int TclLooksLikeInt(char *p)
-#  }
 declare 58 {
     Var *TclLookupVar(Tcl_Interp *interp, const char *part1, const char *part2,
 	    int flags, const char *msg, int createPart1, int createPart2,
 	    Var **arrayPtrPtr)
 }
-# Replaced by Tcl_FSMatchInDirectory in 8.4
-#declare 59 {
-#    int TclpMatchFiles(Tcl_Interp *interp, char *separators,
-#	    Tcl_DString *dirPtr, char *pattern, char *tail)
-#}
 declare 60 {
     int TclNeedSpace(const char *start, const char *end)
 }
@@ -274,37 +164,9 @@ declare 64 {
     int TclObjInvoke(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
 	    int flags)
 }
-# Removed in 8.5a2:
-#declare 65 {
-#    int TclObjInvokeGlobal(Tcl_Interp *interp, int objc,
-#	    Tcl_Obj *const objv[], int flags)
-#}
-#declare 66 {
-#    int TclOpenFileChannelDeleteProc(TclOpenFileChannelProc_ *proc)
-#}
-#declare 67 {
-#    int TclOpenFileChannelInsertProc(TclOpenFileChannelProc_ *proc)
-#}
-# Replaced by Tcl_FSAccess in 8.4:
-#declare 68 {
-#    int TclpAccess(const char *path, int mode)
-#}
 declare 69 {
     char *TclpAlloc(unsigned int size)
 }
-#declare 70 {
-#    int TclpCopyFile(const char *source, const char *dest)
-#}
-#declare 71 {
-#    int TclpCopyDirectory(const char *source, const char *dest,
-#	    Tcl_DString *errorPtr)
-#}
-#declare 72 {
-#    int TclpCreateDirectory(const char *path)
-#}
-#declare 73 {
-#    int TclpDeleteFile(const char *path)
-#}
 declare 74 {
     void TclpFree(char *ptr)
 }
@@ -319,45 +181,9 @@ declare 76 {
 declare 77 {
     void TclpGetTime(Tcl_Time *time)
 }
-# Removed in 8.6:
-#declare 78 {
-#    int TclpGetTimeZone(unsigned long time)
-#}
-# Replaced by Tcl_FSListVolumes in 8.4:
-#declare 79 {
-#    int TclpListVolumes(Tcl_Interp *interp)
-#}
-# Replaced by Tcl_FSOpenFileChannel in 8.4:
-#declare 80 {
-#    Tcl_Channel TclpOpenFileChannel(Tcl_Interp *interp, char *fileName,
-#	    char *modeString, int permissions)
-#}
 declare 81 {
     char *TclpRealloc(char *ptr, unsigned int size)
 }
-#declare 82 {
-#    int TclpRemoveDirectory(const char *path, int recursive,
-#	    Tcl_DString *errorPtr)
-#}
-#declare 83 {
-#    int TclpRenameFile(const char *source, const char *dest)
-#}
-# Removed in 8.1:
-#  declare 84 {
-#      int TclParseBraces(Tcl_Interp *interp, char *str, char **termPtr,
-#  	    ParseValue *pvPtr)
-#  }
-#  declare 85 {
-#      int TclParseNestedCmd(Tcl_Interp *interp, char *str, int flags,
-#  	    char **termPtr, ParseValue *pvPtr)
-#  }
-#  declare 86 {
-#      int TclParseQuotes(Tcl_Interp *interp, char *str, int termChar,
-#  	    int flags, char **termPtr, ParseValue *pvPtr)
-#  }
-#  declare 87 {
-#      void TclPlatformInit(Tcl_Interp *interp)
-#  }
 declare 88 {
     char *TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp,
 	    const char *name1, const char *name2, int flags)
@@ -366,10 +192,6 @@ declare 89 {
     int TclPreventAliasLoop(Tcl_Interp *interp, Tcl_Interp *cmdInterp,
 	    Tcl_Command cmd)
 }
-# Removed in 8.1 (only available if compiled with TCL_COMPILE_DEBUG):
-#  declare 90 {
-#      void TclPrintByteCodeObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
-#  }
 declare 91 {
     void TclProcCleanupProc(Proc *procPtr)
 }
@@ -381,15 +203,6 @@ declare 92 {
 declare 93 {
     void TclProcDeleteProc(ClientData clientData)
 }
-# Removed in 8.5:
-#declare 94 {
-#    int TclProcInterpProc(void *clientData, Tcl_Interp *interp,
-#	    int argc, const char **argv)
-#}
-# Replaced by Tcl_FSStat in 8.4:
-#declare 95 {
-#    int TclpStat(const char *path, Tcl_StatBuf *buf)
-#}
 declare 96 {
     int TclRenameCommand(Tcl_Interp *interp, const char *oldName,
             const char *newName)
@@ -400,16 +213,6 @@ declare 97 {
 declare 98 {
     int TclServiceIdle(void)
 }
-# Removed in 8.4b2:
-#declare 99 {
-#    Tcl_Obj *TclSetElementOfIndexedArray(Tcl_Interp *interp, int localIndex,
-#	    Tcl_Obj *elemPtr, Tcl_Obj *objPtr, int flags)
-#}
-# Removed in 8.4b2:
-#declare 100 {
-#    Tcl_Obj *TclSetIndexedScalar(Tcl_Interp *interp, int localIndex,
-#	    Tcl_Obj *objPtr, int flags)
-#}
 declare 101 {
     CONST86 char *TclSetPreInitScript(const char *string)
 }
@@ -423,16 +226,6 @@ declare 103 {
 declare 104 {
     int TclSockMinimumBuffersOld(int sock, int size)
 }
-# Replaced by Tcl_FSStat in 8.4:
-#declare 105 {
-#    int TclStat(const char *path, Tcl_StatBuf *buf)
-#}
-#declare 106 {
-#    int TclStatDeleteProc(TclStatProc_ *proc)
-#}
-#declare 107 {
-#    int TclStatInsertProc(TclStatProc_ *proc)
-#}
 declare 108 {
     void TclTeardownNamespace(Namespace *nsPtr)
 }
@@ -442,10 +235,6 @@ declare 109 {
 declare 110 {
     int TclSockMinimumBuffers(void *sock, int size)
 }
-# Removed in 8.1:
-#  declare 110 {
-#      char *TclWordEnd(char *start, char *lastChar, int nested, int *semiPtr)
-#  }
 
 # Procedures used in conjunction with Tcl namespaces. They are
 # defined here instead of in tcl.decls since they are not stable yet.
@@ -536,31 +325,9 @@ declare 132 {
 declare 133 {
     struct tm *TclpGetDate(const time_t *time, int useGMT)
 }
-# Removed in 8.5
-#declare 134 {
-#    size_t TclpStrftime(char *s, size_t maxsize, const char *format,
-#	    const struct tm *t, int useGMT)
-#}
-#declare 135 {
-#    int TclpCheckStackSpace(void)
-#}
-
-# Added in 8.1:
-
-#declare 137 {
-#   int TclpChdir(const char *dirName)
-#}
 declare 138 {
     CONST84_RETURN char *TclGetEnv(const char *name, Tcl_DString *valuePtr)
 }
-#declare 139 {
-#    int TclpLoadFile(Tcl_Interp *interp, char *fileName, char *sym1,
-#	    char *sym2, Tcl_PackageInitProc **proc1Ptr,
-#	    Tcl_PackageInitProc **proc2Ptr, void **clientDataPtr)
-#}
-#declare 140 {
-#    int TclLooksLikeInt(const char *bytes, int length)
-#}
 # This is used by TclX, but should otherwise be considered private
 declare 141 {
     CONST84_RETURN char *TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
@@ -592,9 +359,6 @@ declare 148 {
 declare 149 {
     void TclHandleRelease(TclHandle handle)
 }
-
-# Added for Tcl 8.2
-
 declare 150 {
     int TclRegAbout(Tcl_Interp *interp, Tcl_RegExp re)
 }
@@ -608,17 +372,6 @@ declare 152 {
 declare 153 {
     Tcl_Obj *TclGetLibraryPath(void)
 }
-
-# moved to tclTest.c (static) in 8.3.2/8.4a2
-#declare 154 {
-#    int TclTestChannelCmd(void *clientData,
-#    Tcl_Interp *interp, int argc, char **argv)
-#}
-#declare 155 {
-#    int TclTestChannelEventCmd(void *clientData,
-#	     Tcl_Interp *interp, int argc, char **argv)
-#}
-
 declare 156 {
     void TclRegError(Tcl_Interp *interp, const char *msg,
 	    int status)
@@ -634,13 +387,7 @@ declare 158 {
 declare 159 {
     const char *TclGetStartupScriptFileName(void)
 }
-#declare 160 {
-#    int TclpMatchFilesTypes(Tcl_Interp *interp, char *separators,
-#	    Tcl_DString *dirPtr, char *pattern, char *tail,
-#	    GlobTypeData *types)
-#}
 
-# new in 8.3.2/8.4a2
 declare 161 {
     int TclChannelTransform(Tcl_Interp *interp, Tcl_Channel chan,
 	    Tcl_Obj *cmdObjPtr)
@@ -703,23 +450,10 @@ declare 171 {
 declare 172 {
     int TclInThreadExit(void)
 }
-
-# added for 8.4.2
-
 declare 173 {
     int TclUniCharMatch(const Tcl_UniChar *string, int strLen,
 	    const Tcl_UniChar *pattern, int ptnLen, int flags)
 }
-
-# added for 8.4.3
-
-#declare 174 {
-#    Tcl_Obj *TclIncrWideVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
-#	    Tcl_Obj *part2Ptr, Tcl_WideInt wideIncrAmount, int part1NotParsed)
-#}
-
-# Factoring out of trace code
-
 declare 175 {
     int TclCallVarTraces(Interp *iPtr, Var *arrayPtr, Var *varPtr,
 	    const char *part1, const char *part2, int flags, int leaveErrMsg)
@@ -738,19 +472,6 @@ declare 178 {
 declare 179 {
     Tcl_Obj *Tcl_GetStartupScript(const char **encodingNamePtr)
 }
-
-# REMOVED
-# Allocate lists without copying arrays
-# declare 180 {
-#    Tcl_Obj *TclNewListObjDirect(int objc, Tcl_Obj **objv)
-# }
-#declare 181 {
-#    Tcl_Obj *TclDbNewListObjDirect(int objc, Tcl_Obj **objv,
-#	    const char *file, int line)
-#}
-
-# TclpGmtime and TclpLocaltime promoted to the generic interface from unix
-
 declare 182 {
      struct tm *TclpLocaltime(const time_t *clock)
 }
@@ -760,66 +481,10 @@ declare 183 {
 
 # For the new "Thread Storage" subsystem.
 
-### REMOVED on grounds it should never have been exposed. All these
-### functions are now either static in tclThreadStorage.c or
-### MODULE_SCOPE.
-# declare 184 {
-#      void TclThreadStorageLockInit(void)
-# }
-# declare 185 {
-#      void TclThreadStorageLock(void)
-# }
-# declare 186 {
-#      void TclThreadStorageUnlock(void)
-# }
-# declare 187 {
-#      void TclThreadStoragePrint(FILE *outFile, int flags)
-# }
-# declare 188 {
-#      Tcl_HashTable *TclThreadStorageGetHashTable(Tcl_ThreadId id)
-# }
-# declare 189 {
-#      Tcl_HashTable *TclThreadStorageInit(Tcl_ThreadId id, void *reserved)
-# }
-# declare 190 {
-#      void TclThreadStorageDataKeyInit(Tcl_ThreadDataKey *keyPtr)
-# }
-# declare 191 {
-#      void *TclThreadStorageDataKeyGet(Tcl_ThreadDataKey *keyPtr)
-# }
-# declare 192 {
-#      void TclThreadStorageDataKeySet(Tcl_ThreadDataKey *keyPtr, void *data)
-# }
-# declare 193 {
-#      void TclFinalizeThreadStorageThread(Tcl_ThreadId id)
-# }
-# declare 194 {
-#      void TclFinalizeThreadStorage(void)
-# }
-# declare 195 {
-#      void TclFinalizeThreadStorageData(Tcl_ThreadDataKey *keyPtr)
-# }
-# declare 196 {
-#      void TclFinalizeThreadStorageDataKey(Tcl_ThreadDataKey *keyPtr)
-# }
-
-#
-# Added in tcl8.5a5 for compiler/executor experimentation.
-# Disabled in Tcl 8.5.1; experiments terminated. :/
-#
-#declare 197 {
-#    int TclCompEvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-#		        const CmdFrame *invoker, int word)
-#}
 declare 198 {
     int TclObjGetFrame(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    CallFrame **framePtrPtr)
 }
-
-#declare 199 {
-#    int TclMatchIsTrivial(const char *pattern)
-#}
-
 # 200-208 exported for use by the test suite [Bug 1054748]
 declare 200 {
     int TclpObjRemoveDirectory(Tcl_Obj *pathPtr, int recursive,
@@ -851,16 +516,6 @@ declare 208 {
     Tcl_Channel TclpOpenFileChannel(Tcl_Interp *interp,
 	    Tcl_Obj *pathPtr, int mode, int permissions)
 }
-# Made public by TIP 258
-#declare 209 {
-#    Tcl_Obj *TclGetEncodingSearchPath(void)
-#}
-#declare 210 {
-#    int TclSetEncodingSearchPath(Tcl_Obj *searchPath)
-#}
-#declare 211 {
-#    const char *TclpGetEncodingNameFromEnvironment(Tcl_DString *bufPtr)
-#}
 declare 212 {
     void TclpFindExecutable(const char *argv0)
 }
@@ -888,8 +543,6 @@ declare 218 {
 declare 224 {
     TclPlatformType *TclGetPlatform(void)
 }
-
-#
 declare 225 {
     Tcl_Obj *TclTraceDictPath(Tcl_Interp *interp, Tcl_Obj *rootPtr,
 	    int keyc, Tcl_Obj *const keyv[], int flags)
@@ -901,12 +554,6 @@ declare 227 {
     void TclSetNsPath(Namespace *nsPtr, int pathLength,
             Tcl_Namespace *pathAry[])
 }
-#  Used to be needed for TclOO-extension; unneeded now that TclOO is in the
-#  core and NRE-enabled
-#  declare 228 {
-#      int TclObjInterpProcCore(Tcl_Interp *interp, Tcl_Obj *procNameObj,
-#             int skip, ProcErrorProc *errorProc)
-#  }
 declare 229 {
     int	TclPtrMakeUpvar(Tcl_Interp *interp, Var *otherP1Ptr,
 	    const char *myName, int myFlags, int index)
@@ -958,7 +605,7 @@ declare 238 {
 }
 declare 239 {
     int TclNRInterpProcCore(Tcl_Interp *interp, Tcl_Obj *procNameObj,
-			    int skip, ProcErrorProc *errorProc)
+	    int skip, ProcErrorProc *errorProc)
 }
 declare 240 {
     int TclNRRunCallbacks(Tcl_Interp *interp, int result,
@@ -1038,7 +685,6 @@ declare 256 {
     int	TclPtrUnsetVar(Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr,
 	    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags)
 }
-
 declare 257 {
     void TclStaticPackage(Tcl_Interp *interp, const char *prefix,
 	    Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc)
@@ -1075,14 +721,9 @@ declare 3 win {
 declare 4 win {
     HINSTANCE TclWinGetTclInstance(void)
 }
-# new for 8.4.20+/8.5.12+ Cygwin only
 declare 5 win {
     int TclUnixWaitForFile(int fd, int mask, int timeout)
 }
-# Removed in 8.1:
-#  declare 5 win {
-#      HINSTANCE TclWinLoadLibrary(char *name)
-#  }
 declare 6 win {
     unsigned short TclWinNToHS(unsigned short ns)
 }
@@ -1096,14 +737,9 @@ declare 8 win {
 declare 9 win {
     int TclWinGetPlatformId(void)
 }
-# new for 8.4.20+/8.5.12+ Cygwin only
 declare 10 win {
     Tcl_DirEntry *TclpReaddir(TclDIR *dir)
 }
-# Removed in 8.3.1 (for Win32s only)
-#declare 10 win {
-#    int TclWinSynchSpawn(void *args, int type, void **trans, Tcl_Pid *pidPtr)
-#}
 
 # Pipe channel functions
 
@@ -1125,18 +761,9 @@ declare 15 win {
 	    const char **argv, TclFile inputFile, TclFile outputFile,
 	    TclFile errorFile, Tcl_Pid *pidPtr)
 }
-# new for 8.4.20+/8.5.12+ Cygwin only
 declare 16 win {
     int TclpIsAtty(int fd)
 }
-# Signature changed in 8.1:
-#  declare 16 win {
-#      TclFile TclpCreateTempFile(char *contents, Tcl_DString *namePtr)
-#  }
-#  declare 17 win {
-#      char *TclpGetTZName(void)
-#  }
-# new for 8.5.12+ Cygwin only
 declare 17 win {
     int TclUnixCopyFile(const char *src, const char *dst,
 	    const Tcl_StatBuf *statBufPtr, int dontCopyAtts)
@@ -1150,42 +777,21 @@ declare 19 win {
 declare 20 win {
     void TclWinAddProcess(HANDLE hProcess, DWORD id)
 }
-# new for 8.4.20+/8.5.12+
 declare 21 win {
     char *TclpInetNtoa(struct in_addr addr)
 }
-# removed permanently for 8.4
-#declare 21 win {
-#    void TclpAsyncMark(Tcl_AsyncHandler async)
-#}
-
-# Added in 8.1:
 declare 22 win {
     TclFile TclpCreateTempFile(const char *contents)
 }
-# Removed in 8.6:
-#declare 23 win {
-#    char *TclpGetTZName(int isdst)
-#}
 declare 24 win {
     char *TclWinNoBackslash(char *path)
 }
-# replaced by generic TclGetPlatform
-#declare 25 win {
-#    TclPlatformType *TclWinGetPlatform(void)
-#}
 declare 26 win {
     void TclWinSetInterfaces(int wide)
 }
-
-# Added in Tcl 8.3.3 / 8.4
-
 declare 27 win {
     void TclWinFlushDirtyChannels(void)
 }
-
-# Added in 8.4.2
-
 declare 28 win {
     void TclWinResetInterfaces(void)
 }
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index d6621b6..9dc3ca0 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -139,45 +139,6 @@ static const char *TclGetStartupScriptFileName(void)
     return Tcl_GetString(path);
 }
 
-/* (unsupported in Tcl 8.6) */
-
-#define TclGetStringFromObj_ getStringFromObj
-static char *
-TclGetStringFromObj_(
-    Tcl_Obj *objPtr,
-    void *lengthPtr)
-{
-    int length;
-    char *result = Tcl_GetStringFromObj(objPtr, &length);
-    *(size_t *)lengthPtr = (size_t)length;
-    return result;
-}
-
-#define TclGetUnicodeFromObj_ getUnicodeFromObj
-static unsigned short *
-TclGetUnicodeFromObj_(
-    Tcl_Obj *objPtr,
-    void *lengthPtr)
-{
-    int length;
-    Tcl_UniChar *result = Tcl_GetUnicodeFromObj(objPtr, &length);
-    *(size_t *)lengthPtr = (size_t)length;
-    return result;
-}
-
-#define TclGetByteArrayFromObj_ getByteArrayFromObj
-static unsigned char *
-TclGetByteArrayFromObj_(
-    Tcl_Obj *objPtr,
-    void *numBytesPtr)
-{
-    int numBytes;
-    unsigned char *result = Tcl_GetByteArrayFromObj(objPtr, &numBytes);
-    *(size_t *)numBytesPtr = (size_t)numBytes;
-    return result;
-}
-
-
 #if defined(_WIN32) || defined(__CYGWIN__)
 #undef TclWinNToHS
 #define TclWinNToHS winNToHS
@@ -1690,9 +1651,9 @@ const TclStubs tclStubs = {
     0, /* 648 */
     0, /* 649 */
     0, /* 650 */
-    TclGetStringFromObj_, /* 651 */
-    TclGetUnicodeFromObj_, /* 652 */
-    TclGetByteArrayFromObj_, /* 653 */
+    0, /* 651 */
+    0, /* 652 */
+    0, /* 653 */
     0, /* 654 */
     0, /* 655 */
     0, /* 656 */