diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-04 15:12:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-04 15:12:19 (GMT) |
| commit | 6443a1db3be2198d76bc754d9a0f5a9c08683342 (patch) | |
| tree | b24ba1d27f6f2ff0048046b18e73defec6854a56 /generic/tclOO.c | |
| parent | bf23a021385451ff52770191acec3f55d5c8575a (diff) | |
| parent | cb5c9f4f89b6e7242ba07f84e278d35f202d7edd (diff) | |
| download | tcl-6443a1db3be2198d76bc754d9a0f5a9c08683342.zip tcl-6443a1db3be2198d76bc754d9a0f5a9c08683342.tar.gz tcl-6443a1db3be2198d76bc754d9a0f5a9c08683342.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'generic/tclOO.c')
| -rw-r--r-- | generic/tclOO.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tclOO.c b/generic/tclOO.c index 0f0cc96..5f1b816 100644 --- a/generic/tclOO.c +++ b/generic/tclOO.c @@ -138,7 +138,10 @@ static const Tcl_MethodType classConstructor = { */ static const char *initScript = +#ifndef TCL_NO_DEPRECATED "package ifneeded TclOO " TCLOO_PATCHLEVEL " {# Already present, OK?};" +#endif +"package ifneeded tcl::oo " TCLOO_PATCHLEVEL " {# Already present, OK?};" "namespace eval ::oo { variable version " TCLOO_VERSION " };" "namespace eval ::oo { variable patchlevel " TCLOO_PATCHLEVEL " };"; /* "tcl_findLibrary tcloo $oo::version $oo::version" */ @@ -257,7 +260,11 @@ TclOOInit( return TCL_ERROR; } - return Tcl_PkgProvideEx(interp, "TclOO", TCLOO_PATCHLEVEL, +#ifndef TCL_NO_DEPRECATED + Tcl_PkgProvideEx(interp, "TclOO", TCLOO_PATCHLEVEL, + (void *) &tclOOStubs); +#endif + return Tcl_PkgProvideEx(interp, "tcl::oo", TCLOO_PATCHLEVEL, (void *) &tclOOStubs); } |