diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-30 14:36:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-30 14:36:16 (GMT) |
| commit | f327b7e9dc1cae5c4c009b9bf246e397f233f522 (patch) | |
| tree | 6472378a12d49f3e5acd8427e3b2db02a6dd85bb | |
| parent | 72998869a3be3534fec99499faabe2d1557d6bcb (diff) | |
| parent | d7d31d6041d72ace8e80d409c12749ab819499ec (diff) | |
| download | tcl-f327b7e9dc1cae5c4c009b9bf246e397f233f522.zip tcl-f327b7e9dc1cae5c4c009b9bf246e397f233f522.tar.gz tcl-f327b7e9dc1cae5c4c009b9bf246e397f233f522.tar.bz2 | |
merge core-8-6-branch.
Provide compatibility macro's, compensating for the internal stub table change, so Itcl 3.4 builds again. Thanks to Don Porter for bringing this to my attention!
| -rw-r--r-- | generic/tclIntDecls.h | 12 | ||||
| -rw-r--r-- | generic/tclLink.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 22b8072..f2654c0 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -1354,17 +1354,29 @@ extern const TclIntStubs *tclIntStubsPtr; # undef TclSetStartupScript # undef TclGetStartupScript # undef TclCreateNamespace +# define tcl_CreateNamespace tclCreateNamespace # undef TclDeleteNamespace +# define tcl_DeleteNamespace tclDeleteNamespace # undef TclAppendExportList +# define tcl_AppendExportList tclAppendExportList # undef TclExport +# define tcl_Export tclExport # undef TclImport +# define tcl_Import tclImport # undef TclForgetImport +# define tcl_ForgetImport tclForgetImport # undef TclGetCurrentNamespace_ +# define tcl_GetCurrentNamespace tclGetCurrentNamespace_ # undef TclGetGlobalNamespace_ +# define tcl_GetGlobalNamespace tclGetGlobalNamespace_ # undef TclFindNamespace +# define tcl_FindNamespace tclFindNamespace # undef TclFindCommand +# define tcl_FindCommand tclFindCommand # undef TclGetCommandFromObj +# define tcl_GetCommandFromObj tclGetCommandFromObj # undef TclGetCommandFullName +# define tcl_GetCommandFullName tclGetCommandFullName # undef TclCopyChannelOld # undef TclSockMinimumBuffersOld #endif diff --git a/generic/tclLink.c b/generic/tclLink.c index 7366acc..53187d7 100644 --- a/generic/tclLink.c +++ b/generic/tclLink.c @@ -654,7 +654,7 @@ static Tcl_ObjType invalidRealType = { NULL, /* freeIntRepProc */ NULL, /* dupIntRepProc */ NULL, /* updateStringProc */ - SetInvalidRealFromAny /* setFromAnyProc */ + NULL /* setFromAnyProc */ }; static int |