about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-07 05:57:27 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-07 05:57:27 +0000
commit8f61a78efeb714b82549df45f735f5e7ee9c1826 (patch)
tree24065a01fff26bf68a25899b20f0650582b5620e
parent52aac1978e7d5113671535a4a1a238de18e9a43e (diff)
downloadglibc-8f61a78efeb714b82549df45f735f5e7ee9c1826.tar.gz
glibc-8f61a78efeb714b82549df45f735f5e7ee9c1826.tar.xz
glibc-8f61a78efeb714b82549df45f735f5e7ee9c1826.zip
Update.
	* iconvdata/sami-ws2.c (CHARSET_NAME): Fix typo.
	* iconvdata/iso_2033.c (CHARSET_NAME): Fix typo.
	* iconvdata/ecma-cyrillic.c (CHARSET_NAME): Fix typo.
	* iconvdata/gconv-modules: Correct ISO646-PT2 alias.  Add
	SHIFT_JIS alias.
	Reported by Bruno Haible <haible@ilog.fr>.
-rw-r--r--ChangeLog7
-rw-r--r--iconvdata/ecma-cyrillic.c4
-rw-r--r--iconvdata/gconv-modules3
-rw-r--r--iconvdata/iso_2033.c4
-rw-r--r--iconvdata/sami-ws2.c2
5 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f268604ca6..4def948c70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 1999-12-06  Ulrich Drepper  <drepper@cygnus.com>
 
+	* iconvdata/sami-ws2.c (CHARSET_NAME): Fix typo.
+	* iconvdata/iso_2033.c (CHARSET_NAME): Fix typo.
+	* iconvdata/ecma-cyrillic.c (CHARSET_NAME): Fix typo.
+	* iconvdata/gconv-modules: Correct ISO646-PT2 alias.  Add
+	SHIFT_JIS alias.
+	Reported by Bruno Haible <haible@ilog.fr>.
+
 	* locale/programs/xstrdup.c: It's _LIBC, not __LIBC.
 
 1999-12-03  Andreas Jaeger  <aj@suse.de>
diff --git a/iconvdata/ecma-cyrillic.c b/iconvdata/ecma-cyrillic.c
index 656a095b25..c8cf0ba19c 100644
--- a/iconvdata/ecma-cyrillic.c
+++ b/iconvdata/ecma-cyrillic.c
@@ -1,5 +1,5 @@
 /* Conversion from and to ECMA-CYRILLIC.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -23,7 +23,7 @@
 /* Get the conversion table.  */
 #define TABLES <ecma-cyrillic.h>
 
-#define CHARSET_NAME	"ECMS-CYRILLIC//"
+#define CHARSET_NAME	"ECMA-CYRILLIC//"
 #define HAS_HOLES	0	/* All 256 character are defined.  */
 
 #include <8bit-gap.c>
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 4149eb56d7..fd571ee37a 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -189,7 +189,7 @@ module	PT//			INTERNAL		ISO646		2
 module	INTERNAL		PT//			ISO646		2
 
 alias	ISO-IR-84//		PT2//
-alias	ISO646-PT2		PT2//
+alias	ISO646-PT2//		PT2//
 alias	CSISO84PORTUGUESE2//	PT2//
 module	PT2//			INTERNAL		ISO646		2
 module	INTERNAL		PT2//			ISO646		2
@@ -380,6 +380,7 @@ module	INTERNAL		ISO_6937-2//		ISO_6937-2	1
 
 #	from			to			module		cost
 alias	SHIFT-JIS//		SJIS//
+alias	SHIFT_JIS//		SJIS//
 alias	CP932//			SJIS//
 alias	MS_KANJI//		SJIS//
 alias	CSSHIFTJIS//		SJIS//
diff --git a/iconvdata/iso_2033.c b/iconvdata/iso_2033.c
index 6c51773db7..10c3693a66 100644
--- a/iconvdata/iso_2033.c
+++ b/iconvdata/iso_2033.c
@@ -1,5 +1,5 @@
 /* Conversion from and to ISO_2033-1983.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -23,7 +23,7 @@
 /* Get the conversion table.  */
 #define TABLES <iso_2033.h>
 
-#define CHARSET_NAME	"ISO_2033-1983//"
+#define CHARSET_NAME	"ISO_2033//"
 #define HAS_HOLES	1	/* Not all 256 character are defined.  */
 
 #include <8bit-gap.c>
diff --git a/iconvdata/sami-ws2.c b/iconvdata/sami-ws2.c
index 20eb5f9175..a1d375cab6 100644
--- a/iconvdata/sami-ws2.c
+++ b/iconvdata/sami-ws2.c
@@ -23,7 +23,7 @@
 /* Get the conversion table.  */
 #define TABLES <sami-ws2.h>
 
-#define CHARSET_NAME	"SAMI-WS2//"
+#define CHARSET_NAME	"WIN-SAMI-2//"
 #define HAS_HOLES	1	/* Not all 256 character are defined.  */
 
 #include <8bit-gap.c>