From: Bruno Haible <bruno@clisp.org>
Date: Tue, 24 Jul 2001 12:53:20 +0000 (+0000)
Subject: Change canonical names of two charsets.
X-Git-Tag: v0.10.39~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b117377323d1f0576d0ffdc05423ae6a33309d6;p=thirdparty%2Fgettext.git

Change canonical names of two charsets.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index fc384de4a..67551a460 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-24  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Change canonical name of BIG5HKSCS to BIG5-HKSCS.
+	Change canonical name of SJIS to SHIFT_JIS.
+
 2001-06-12  Bruno Haible  <haible@clisp.cons.org>
 
 	* dcigettext.c (DCIGETTEXT): Release the lock before returning.
diff --git a/intl/config.charset b/intl/config.charset
index d6f369558..f4f2611c5 100755
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -80,10 +80,10 @@
 #   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
 #   EUC-TW                    glibc aix hpux irix osf solaris
 #   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5HKSCS                 glibc
+#   BIG5-HKSCS                glibc
 #   GBK                       aix osf win32 dos
 #   GB18030                   glibc
-#   SJIS                      hpux osf solaris freebsd
+#   SHIFT_JIS                 hpux osf solaris freebsd                  yes
 #   JOHAB                     glibc win32
 #   TIS-620                   glibc aix hpux osf solaris
 #   VISCII                    glibc                                     yes
@@ -174,7 +174,7 @@ case "$os" in
 	echo "eucTW EUC-TW"
 	echo "hp15CN GB2312"
 	#echo "ccdc ?" # what is this?
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "utf8 UTF-8"
 	;;
     irix*)
@@ -209,7 +209,7 @@ case "$os" in
 	echo "GBK GBK"
 	echo "KSC5601 CP949"
 	echo "sdeckanji EUC-JP"
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "TACTIS TIS-620"
 	echo "UTF-8 UTF-8"
 	;;
@@ -230,7 +230,7 @@ case "$os" in
 	echo "cns11643 EUC-TW"
 	echo "5601 EUC-KR"
 	echo "eucJP EUC-JP"
-	echo "PCK SJIS"
+	echo "PCK SHIFT_JIS"
 	echo "TIS620.2533 TIS-620"
 	#echo "sun_eu_greek ?" # what is this?
 	echo "UTF-8 UTF-8"
@@ -266,8 +266,8 @@ case "$os" in
 	echo "zh_TW.Big5 BIG5"
 	echo "zh_CN.EUC GB2312"
 	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SJIS"
-	echo "ja_JP.Shift_JIS SJIS"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ja_JP.Shift_JIS SHIFT_JIS"
 	echo "ko_KR.EUC EUC-KR"
 	;;
     beos*)
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 025ab30a5..bd596e7d6 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-24  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Change canonical name of BIG5HKSCS to BIG5-HKSCS.
+	Change canonical name of SJIS to SHIFT_JIS.
+
+2001-06-25  Bruno Haible  <haible@clisp.cons.org>
+
+	* mbswidth.c (mbsinit): Define to 1 if not defined. For SCO 3.2v5.0.2.
+
 2001-04-30  Bruno Haible  <haible@clisp.cons.org>
 
 	Silence "gcc -Wall -Wwrite-strings" warnings.
diff --git a/lib/config.charset b/lib/config.charset
index d6f369558..f4f2611c5 100755
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -80,10 +80,10 @@
 #   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
 #   EUC-TW                    glibc aix hpux irix osf solaris
 #   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5HKSCS                 glibc
+#   BIG5-HKSCS                glibc
 #   GBK                       aix osf win32 dos
 #   GB18030                   glibc
-#   SJIS                      hpux osf solaris freebsd
+#   SHIFT_JIS                 hpux osf solaris freebsd                  yes
 #   JOHAB                     glibc win32
 #   TIS-620                   glibc aix hpux osf solaris
 #   VISCII                    glibc                                     yes
@@ -174,7 +174,7 @@ case "$os" in
 	echo "eucTW EUC-TW"
 	echo "hp15CN GB2312"
 	#echo "ccdc ?" # what is this?
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "utf8 UTF-8"
 	;;
     irix*)
@@ -209,7 +209,7 @@ case "$os" in
 	echo "GBK GBK"
 	echo "KSC5601 CP949"
 	echo "sdeckanji EUC-JP"
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "TACTIS TIS-620"
 	echo "UTF-8 UTF-8"
 	;;
@@ -230,7 +230,7 @@ case "$os" in
 	echo "cns11643 EUC-TW"
 	echo "5601 EUC-KR"
 	echo "eucJP EUC-JP"
-	echo "PCK SJIS"
+	echo "PCK SHIFT_JIS"
 	echo "TIS620.2533 TIS-620"
 	#echo "sun_eu_greek ?" # what is this?
 	echo "UTF-8 UTF-8"
@@ -266,8 +266,8 @@ case "$os" in
 	echo "zh_TW.Big5 BIG5"
 	echo "zh_CN.EUC GB2312"
 	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SJIS"
-	echo "ja_JP.Shift_JIS SJIS"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ja_JP.Shift_JIS SHIFT_JIS"
 	echo "ko_KR.EUC EUC-KR"
 	;;
     beos*)