Update from latest gettext.

2 files changed, 12 insertions, 9 deletions

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*)
diff --git a/lib/localcharset.c b/lib/localcharset.c
index 575372dca..61f8f3e85 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -69,16 +69,19 @@
    'charset_aliases' simultaneously, both will produce the same value,
    and everything will be ok if the two assignments to 'charset_aliases'
    are atomic. But I don't know what will happen if the two assignments mix.  */
+#if __STDC__ != 1
+# define volatile /* empty */
+#endif
 /* Pointer to the contents of the charset.alias file, if it has already been
    read, else NULL.  Its format is:
    ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-static char * volatile charset_aliases;
+static const char * volatile charset_aliases;
 
 /* Return a pointer to the contents of the charset.alias file.  */
 static const char *
 get_charset_aliases ()
 {
-  char *cp;
+  const char *cp;
 
   cp = charset_aliases;
   if (cp == NULL)