diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-10 11:55:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-10 11:55:34 (GMT) |
| commit | 72c49f69099c98bd55334dbad3d68645c72bc707 (patch) | |
| tree | 0debb19ded04cad467e9517c2299fcb5b41ba197 /library | |
| parent | feb336f6b3663f107c978288f063f1e7cf9b2458 (diff) | |
| parent | 44d6e3ab5ea76fb135058f21fde9dfebdbbd035b (diff) | |
| download | tcl-72c49f69099c98bd55334dbad3d68645c72bc707.zip tcl-72c49f69099c98bd55334dbad3d68645c72bc707.tar.gz tcl-72c49f69099c98bd55334dbad3d68645c72bc707.tar.bz2 | |
Merge 8.7. Tweak "tclreg" directory/library name and tclLoad.c, such that the entry point of the "dde" and "registry" extensions can be guessed correctly
Diffstat (limited to 'library')
| -rw-r--r-- | library/dde/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/registry/pkgIndex.tcl (renamed from library/reg/pkgIndex.tcl) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl index a87db33..14f22a4 100644 --- a/library/dde/pkgIndex.tcl +++ b/library/dde/pkgIndex.tcl @@ -1,3 +1,3 @@ if {![package vsatisfies [package provide Tcl] 8.5-]} return if {[info sharedlibextension] != ".dll"} return -package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll] dde] +package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll]] diff --git a/library/reg/pkgIndex.tcl b/library/registry/pkgIndex.tcl index 0413df6..8b35997 100644 --- a/library/reg/pkgIndex.tcl +++ b/library/registry/pkgIndex.tcl @@ -1,4 +1,4 @@ if {![package vsatisfies [package provide Tcl] 8.5-]} return if {[info sharedlibextension] != ".dll"} return package ifneeded registry 1.3.5 \ - [list load [file join $dir tclreg13.dll] registry] + [list load [file join $dir tclregistry13.dll]] |