1 files changed, 24 insertions, 91 deletions

diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index f0e907f..102d04b 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -52,7 +52,7 @@ declare 7 {
     int TclCopyAndCollapse(int count, const char *src, char *dst)
 }
 declare 8 {
-    int TclCopyChannelOld(Tcl_Interp *interp, Tcl_Channel inChan,
+    int TclCopyChannel(Tcl_Interp *interp, Tcl_Channel inChan,
 	    Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr)
 }
 
@@ -161,12 +161,11 @@ declare 34 {
 #    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 36 {
+    int TclGetLong(Tcl_Interp *interp, const char *str, long *longPtr)
+}
 declare 37 {
-    int TclGetLoadedPackages(Tcl_Interp *interp, const char *targetName)
+    int TclGetLoadedPackages(Tcl_Interp *interp, char *targetName)
 }
 declare 38 {
     int TclGetNamespaceForQualName(Tcl_Interp *interp, const char *qualName,
@@ -184,7 +183,7 @@ declare 41 {
     Tcl_Command TclGetOriginalCommand(Tcl_Command command)
 }
 declare 42 {
-    CONST86 char *TclpGetUserHome(const char *name, Tcl_DString *bufferPtr)
+    char *TclpGetUserHome(const char *name, Tcl_DString *bufferPtr)
 }
 # Removed in Tcl 8.5a2
 #declare 43 {
@@ -319,10 +318,9 @@ declare 76 {
 declare 77 {
     void TclpGetTime(Tcl_Time *time)
 }
-# Removed in 8.6:
-#declare 78 {
-#    int TclpGetTimeZone(unsigned long time)
-#}
+declare 78 {
+    int TclpGetTimeZone(unsigned long time)
+}
 # Replaced by Tcl_FSListVolumes in 8.4:
 #declare 79 {
 #    int TclpListVolumes(Tcl_Interp *interp)
@@ -411,7 +409,7 @@ declare 98 {
 #	    Tcl_Obj *objPtr, int flags)
 #}
 declare 101 {
-    CONST86 char *TclSetPreInitScript(const char *string)
+    char *TclSetPreInitScript(char *string)
 }
 declare 102 {
     void TclSetupEnv(Tcl_Interp *interp)
@@ -578,7 +576,7 @@ declare 144 {
 	    int index)
 }
 declare 145 {
-    const struct AuxDataType *TclGetAuxDataType(const char *typeName)
+    struct AuxDataType *TclGetAuxDataType(char *typeName)
 }
 declare 146 {
     TclHandle TclHandleCreate(void *ptr)
@@ -626,13 +624,11 @@ declare 156 {
 declare 157 {
     Var *TclVarTraceExists(Tcl_Interp *interp, const char *varName)
 }
-# REMOVED (except from stub table) - use public Tcl_SetStartupScript()
 declare 158 {
     void TclSetStartupScriptFileName(const char *filename)
 }
-# REMOVED (except from stub table) - use public Tcl_GetStartupScript()
 declare 159 {
-    const char *TclGetStartupScriptFileName(void)
+    CONST84_RETURN char *TclGetStartupScriptFileName(void)
 }
 #declare 160 {
 #    int TclpMatchFilesTypes(Tcl_Interp *interp, char *separators,
@@ -655,7 +651,7 @@ declare 162 {
 # correct type when calling this procedure.
 
 declare 163 {
-    const void *TclGetInstructionTable(void)
+    void *TclGetInstructionTable(void)
 }
 
 # ALERT: The argument of 'TclExpandCodeArray' is actually a
@@ -678,11 +674,9 @@ declare 166 {
 }
 
 # VFS-aware versions of Tcl*StartupScriptFileName (158 and 159 above)
-# REMOVED (except from stub table) - use public Tcl_SetStartupScript()
 declare 167 {
     void TclSetStartupScriptPath(Tcl_Obj *pathPtr)
 }
-# REMOVED (except from stub table) - use public Tcl_GetStartupScript()
 declare 168 {
     Tcl_Obj *TclGetStartupScriptPath(void)
 }
@@ -731,7 +725,6 @@ declare 177 {
     void TclVarErrMsg(Tcl_Interp *interp, const char *part1, const char *part2,
 	    const char *operation, const char *reason)
 }
-# TIP 338 made these public - now declared in tcl.h too
 declare 178 {
     void Tcl_SetStartupScript(Tcl_Obj *pathPtr, const char *encodingName)
 }
@@ -901,12 +894,10 @@ 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(register Tcl_Interp *interp, Tcl_Obj *procNameObj,
-#             int skip, ProcErrorProc *errorProc)
-#  }
+declare 228 {
+    int TclObjInterpProcCore(register 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)
@@ -945,67 +936,15 @@ declare 236 {
     void TclBackgroundException(Tcl_Interp *interp, int code)
 }
 
-# TIP #285: Script cancellation support.
-declare 237 {
-    int TclResetCancellation(Tcl_Interp *interp, int force)
-}
-
-# NRE functions for "rogue" extensions to exploit NRE; they will need to
-# include NRE.h too.
-declare 238 {
-    int TclNRInterpProc(ClientData clientData, Tcl_Interp *interp,
-	    int objc, Tcl_Obj *const objv[])
-}
-declare 239 {
-    int TclNRInterpProcCore(Tcl_Interp *interp, Tcl_Obj *procNameObj,
-			    int skip, ProcErrorProc *errorProc)
-}
-declare 240 {
-    int TclNRRunCallbacks(Tcl_Interp *interp, int result,
-	      struct NRE_callback *rootPtr)
-}
-declare 241 {
-    int TclNREvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags,
-	    const CmdFrame *invoker, int word)
-}
-declare 242 {
-    int TclNREvalObjv(Tcl_Interp *interp, int objc,
-	      Tcl_Obj *const objv[], int flags, Command *cmdPtr)
-}
-
 # Tcl_Obj leak detection support.
 declare 243 {
     void TclDbDumpActiveObjects(FILE *outFile)
 }
 
-# Functions to make things better for itcl
-declare 244 {
-    Tcl_HashTable *TclGetNamespaceChildTable(Tcl_Namespace *nsPtr)
-}
-declare 245 {
-    Tcl_HashTable *TclGetNamespaceCommandTable(Tcl_Namespace *nsPtr)
-}
-declare 246 {
-    int TclInitRewriteEnsemble(Tcl_Interp *interp, int numRemoved,
-	    int numInserted, Tcl_Obj *const *objv)
-}
-declare 247 {
-    void TclResetRewriteEnsemble(Tcl_Interp *interp, int isRootEnsemble)
-}
-
-declare 248 {
-    int TclCopyChannel(Tcl_Interp *interp, Tcl_Channel inChan,
-	    Tcl_Channel outChan, Tcl_WideInt toRead, Tcl_Obj *cmdPtr)
-}
-
 declare 249 {
     char *TclDoubleDigits(double dv, int ndigits, int flags,
 			  int *decpt, int *signum, char **endPtr)
 }
-# TIP #285: Script cancellation support.
-declare 250 {
-    void TclSetSlaveCancelFlags(Tcl_Interp *interp, int flags, int force)
-}
 
 ##############################################################################
 
@@ -1122,10 +1061,9 @@ declare 21 win {
 declare 22 win {
     TclFile TclpCreateTempFile(const char *contents)
 }
-# Removed in 8.6:
-#declare 23 win {
-#    char *TclpGetTZName(int isdst)
-#}
+declare 23 win {
+    char *TclpGetTZName(int isdst)
+}
 declare 24 win {
     char *TclWinNoBackslash(char *path)
 }
@@ -1148,6 +1086,9 @@ declare 27 win {
 declare 28 win {
     void TclWinResetInterfaces(void)
 }
+declare 29 win {
+    int TclWinCPUID(unsigned int index, unsigned int *regs)
+}
 
 ################################
 # Unix specific functions
@@ -1239,17 +1180,9 @@ declare 18 macosx {
 declare 19 macosx {
     void TclMacOSXNotifierAddRunLoopMode(const void *runLoopMode)
 }
-
-declare 29 {win unix} {
+declare 29 unix {
     int TclWinCPUID(unsigned int index, unsigned int *regs)
 }
-# Added in 8.6; core of TclpOpenTemporaryFile
-declare 30 {win unix} {
-    int TclUnixOpenTemporaryFile(Tcl_Obj *dirObj, Tcl_Obj *basenameObj,
-	    Tcl_Obj *extensionObj, Tcl_Obj *resultingNameObj)
-}
-
-
 
 # Local Variables:
 # mode: tcl