merge 8.5

1 files changed, 11 insertions, 3 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 903669d..256701d 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -51,7 +51,7 @@ declare 6 {
     char *Tcl_DbCkalloc(unsigned int size, const char *file, int line)
 }
 declare 7 {
-    int Tcl_DbCkfree(char *ptr, const char *file, int line)
+    void Tcl_DbCkfree(char *ptr, const char *file, int line)
 }
 declare 8 {
     char *Tcl_DbCkrealloc(char *ptr, unsigned int size,
@@ -2135,12 +2135,12 @@ declare 1 win {
 ################################
 # Mac OS X specific functions
 
-declare 0 {unix macosx} {
+declare 0 macosx {
     int Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
 	    const char *bundleName, int hasResourceFile,
 	    int maxPathLen, char *libraryPath)
 }
-declare 1 {unix macosx} {
+declare 1 macosx {
     int Tcl_MacOSXOpenVersionedBundleResources(Tcl_Interp *interp,
 	    const char *bundleName, const char *bundleVersion,
 	    int hasResourceFile, int maxPathLen, char *libraryPath)
@@ -2154,6 +2154,14 @@ export {
     void Tcl_Main(int argc, char **argv, Tcl_AppInitProc *appInitProc)
 }
 export {
+    const char *Tcl_InitStubs(Tcl_Interp *interp, const char *version,
+	int exact)
+}
+export {
+    const char *TclTomMathInitializeStubs(Tcl_Interp* interp,
+	const char* version, int epoch, int revision)
+}
+export {
     const char *Tcl_PkgInitStubsCheck(Tcl_Interp *interp, const char *version,
 	int exact)
 }