summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--unix/tclUnixInit.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 935d45d..27ddb3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-05 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+
+ * unix/tclUnixInit.c (localeTable): Solaris uses a non-standard
+ name for the cp1251 charset. Thanks to Victor Wagner for reporting
+ this. [Bug 1252475]
+
2005-08-05 Kevin Kenny <kennykb@users.sourceforge.net>
* generic/tclExecute.c (TclExecuteByteCode): Fixed a corner case
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index a47e763..e63160d 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -7,7 +7,7 @@
* Copyright (c) 1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tclUnixInit.c,v 1.34.2.8 2005/05/24 04:20:12 das Exp $
+ * RCS: @(#) $Id: tclUnixInit.c,v 1.34.2.9 2005/08/05 20:48:19 dkf Exp $
*/
#if defined(HAVE_COREFOUNDATION)
@@ -81,6 +81,7 @@ typedef struct LocaleTable {
static CONST LocaleTable localeTable[] = {
#ifdef HAVE_LANGINFO
{"gb2312-1980", "gb2312"},
+ {"ansi-1251", "cp1251"}, /* Solaris gets this wrong. */
#ifdef __hpux
{"SJIS", "shiftjis"},
{"eucjp", "euc-jp"},