diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-10 12:42:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-10 12:42:19 (GMT) |
| commit | 62fea308478c8fb3e38594793d72d6dbd9569d19 (patch) | |
| tree | 86c66951abdb14f5a59bccbcee1dfc328d6de24f /library | |
| parent | b69bf6e78ac2d6acfc2aa53956acc3e7dbe98e1c (diff) | |
| parent | 4d51f6b054999c72115751f3895158195e42b40d (diff) | |
| download | tcl-62fea308478c8fb3e38594793d72d6dbd9569d19.zip tcl-62fea308478c8fb3e38594793d72d6dbd9569d19.tar.gz tcl-62fea308478c8fb3e38594793d72d6dbd9569d19.tar.bz2 | |
Merge 8.5
Diffstat (limited to 'library')
| -rw-r--r-- | library/dde/pkgIndex.tcl | 4 | ||||
| -rwxr-xr-x | library/reg/pkgIndex.tcl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl index 7aa67fa..bcb5f9c 100644 --- a/library/dde/pkgIndex.tcl +++ b/library/dde/pkgIndex.tcl @@ -1,5 +1,5 @@ -if {([info commands ::tcl::pkgconfig] eq "") - || ([info sharedlibextension] ne ".dll")} return +if {![package vsatisfies [package provide Tcl] 8.5]} return +if {[info sharedlibextension] != ".dll"} return if {[::tcl::pkgconfig get debug]} { package ifneeded dde 1.4.1 [list load [file join $dir tcldde14g.dll] dde] } else { diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl index ee559b5..9a85944 100755 --- a/library/reg/pkgIndex.tcl +++ b/library/reg/pkgIndex.tcl @@ -1,5 +1,5 @@ -if {([info commands ::tcl::pkgconfig] eq "") - || ([info sharedlibextension] ne ".dll")} return +if {![package vsatisfies [package provide Tcl] 8.5]} return +if {[info sharedlibextension] != ".dll"} return if {[::tcl::pkgconfig get debug]} { package ifneeded registry 1.3.3 \ [list load [file join $dir tclreg13g.dll] registry] |