summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2003-03-23 01:34:40 (GMT)
committerKevin B Kenny <kennykb@acm.org>2003-03-23 01:34:40 (GMT)
commit668371a4f1e9f90b7d69d55e27ebeef487148ddd (patch)
tree81bc46bfc7cd742cc26f5135b44467fa666d3cc4
parent7397eb21b5546e2f2db642b3a7fda20d24bfd70b (diff)
downloadtcl-668371a4f1e9f90b7d69d55e27ebeef487148ddd.zip
tcl-668371a4f1e9f90b7d69d55e27ebeef487148ddd.tar.gz
tcl-668371a4f1e9f90b7d69d55e27ebeef487148ddd.tar.bz2
Fixed a bug where [package require dde] or [package require registry]
attempted to load the release version of the DLL into a debug build. [Bug 708218] Thanks to Joe Mistachkin for the patch.
-rw-r--r--ChangeLog8
-rw-r--r--library/dde/pkgIndex.tcl2
-rwxr-xr-xlibrary/reg/pkgIndex.tcl2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 95cbae6..54cf21d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-22 Kevin Kenny <kennykb@acm.org>
+
+ * library/dde/pkgIndex.tcl:
+ * library/reg/pkgIndex.tcl: Fixed a bug where [package require dde]
+ or [package require registry] attempted to load the release version
+ of the DLL into a debug build. [Bug 708218] Thanks to Joe Mistachkin
+ for the patch.
+
2003-03-20 Don Porter <dgp@users.sourceforge.net>
* generic/tclInt.h (tclOriginalNotifier):
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index b651038..49201f4 100644
--- a/library/dde/pkgIndex.tcl
+++ b/library/dde/pkgIndex.tcl
@@ -1,5 +1,5 @@
if {![package vsatisfies [package provide Tcl] 8]} {return}
-if {[info exists tcl_platform(debug)]} {
+if {[info exists ::tcl_platform(debug)]} {
package ifneeded dde 1.2.1 [list load [file join $dir tcldde12g.dll] dde]
} else {
package ifneeded dde 1.2.1 [list load [file join $dir tcldde12.dll] dde]
diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl
index d4bd27b..230d120 100755
--- a/library/reg/pkgIndex.tcl
+++ b/library/reg/pkgIndex.tcl
@@ -1,5 +1,5 @@
if {![package vsatisfies [package provide Tcl] 8]} {return}
-if {[info exists tcl_platform(debug)]} {
+if {[info exists ::tcl_platform(debug)]} {
package ifneeded registry 1.1.1 \
[list load [file join $dir tclreg11g.dll] registry]
} else {