Subject: Fix msgcat.test (in case a higher msgcat version is encountered, which is not included with Tcl 8.4) <p>Doc fix in TCL_MEM_DEBUG.3

From: "[email-masked]" <jan.nijtmans>
Date: Fri, 16 Nov 2012 10:16:18 +0000

---
 doc/TCL_MEM_DEBUG.3 | 2 +-
 tests/msgcat.test   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/TCL_MEM_DEBUG.3 b/doc/TCL_MEM_DEBUG.3
index c531ac6..def44c1 100644
--- a/doc/TCL_MEM_DEBUG.3
+++ b/doc/TCL_MEM_DEBUG.3
@@ -26,7 +26,7 @@ version of \fBTcl_InitMemory\fR to add the \fBmemory\fR command to Tcl.
 \fBTCL_MEM_DEBUG\fR must be either left defined for all modules or undefined
 for all modules that are going to be linked together.  If they are not, link
 errors will occur, with either \fBTclDbCkfree\fR and \fBTcl_DbCkalloc\fR or
-\fBTcl_Ckalloc\fR and \fBTcl_Ckfree\fR being undefined.
+\fBTcl_Alloc\fR and \fBTcl_Free\fR being undefined.
 .PP
 Once memory debugging support has been compiled into Tcl, the C
 functions \fBTcl_ValidateAllMemory\fR, and \fBTcl_DumpActiveMemory\fR,
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 237a482..3440106 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -55,6 +55,13 @@ namespace eval ::msgcat::test {
 	    if {[info exists ::tcl::mac::locale]} {
 		set result [string tolower $::tcl::mac::locale]
 	    } else {
+		if {([info sharedlibextension] == ".dll")
+			&& ![catch {package require registry}]} {
+		    # Windows and Cygwin have other ways to determine the
+		    # locale when the environment variables are missing
+		    # and the registry package is present
+		    continue
+		}
 		set result c
 	    }
 	}
-- 
cgit v0.12