Update.

2000-09-11  Ulrich Drepper  <drepper@redhat.com>

	* iconv/skeleton.c: Fix last patch, add missing parameter to
	unaligned function call.

4 files changed, 71 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 0af077bd8d..e2e08fe77f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-11  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconv/skeleton.c: Fix last patch, add missing parameter to
+	unaligned function call.
+
 2000-09-10  Bruno Haible  <haible@clisp.cons.org>
 
 	* locale/programs/ld-collate.c (collate_read): Fix typo in handling
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index f459ed588f..43d5d9e4a9 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -523,6 +523,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 			    /* Run the conversion loop.  */
 			    nstatus = GEN_unaligned (FROM_LOOP) (step, data,
 								 inptrp, inend,
+								 &outbuf,
 								 (unsigned char *) outerr,
 								 lirreversiblep
 								 EXTRA_LOOP_ARGS);
@@ -530,6 +531,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 			    /* Run the conversion loop.  */
 			    nstatus = GEN_unaligned (TO_LOOP) (step, data,
 							       inptrp, inend,
+							       &outbuf,
 							       (unsigned char *) outerr,
 							       lirreversiblep
 							       EXTRA_LOOP_ARGS);
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 02d4e36a22..8c70a54194 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-11  Ulrich Drepper  <drepper@redhat.com>
+
+	* charmaps/GB18030: Add back entries which got lost in last change.
+
 2000-09-08  Ulrich Drepper  <drepper@redhat.com>
 
 	* charmaps/GB18030: Update once more.
diff --git a/localedata/charmaps/GB18030 b/localedata/charmaps/GB18030
index b678c08c55..356790c3f4 100644
--- a/localedata/charmaps/GB18030
+++ b/localedata/charmaps/GB18030
@@ -7289,6 +7289,8 @@ CHARMAP
 <U3093>     /xa4/xf3         HIRAGANA LETTER N
 <U3094>     /x81/x39/xa6/x37 HIRAGANA LETTER VU
 <U3099>     /x81/x39/xa7/x32 COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+<U309A>     /x81/x39/xa7/x33 COMBINING KATAKANA-HIRAGANA SEMI VOICED SOUND MARK
+<U309B>     /xa9/x61         KATAKANA-HIRAGANA VOICED SOUND MARK
 <U309C>     /xa9/x62         KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
 <U309D>     /xa9/x66         HIRAGANA ITERATION MARK
 <U309E>     /xa9/x67         HIRAGANA VOICED ITERATION MARK
@@ -7305,7 +7307,31 @@ CHARMAP
 <U30AB>     /xa5/xab         KATAKANA LETTER KA
 <U30AC>     /xa5/xac         KATAKANA LETTER GA
 <U30AD>     /xa5/xad         KATAKANA LETTER KI
+<U30AE>     /xa5/xae         KATAKANA LETTER GI
+<U30AF>     /xa5/xaf         KATAKANA LETTER KU
+<U30B0>     /xa5/xb0         KATAKANA LETTER GU
+<U30B1>     /xa5/xb1         KATAKANA LETTER KE
+<U30B2>     /xa5/xb2         KATAKANA LETTER GE
+<U30B3>     /xa5/xb3         KATAKANA LETTER KO
+<U30B4>     /xa5/xb4         KATAKANA LETTER GO
+<U30B5>     /xa5/xb5         KATAKANA LETTER SA
+<U30B6>     /xa5/xb6         KATAKANA LETTER ZA
+<U30B7>     /xa5/xb7         KATAKANA LETTER SI
+<U30B8>     /xa5/xb8         KATAKANA LETTER ZI
 <U30B9>     /xa5/xb9         KATAKANA LETTER SU
+<U30BA>     /xa5/xba         KATAKANA LETTER ZU
+<U30BB>     /xa5/xbb         KATAKANA LETTER SE
+<U30BC>     /xa5/xbc         KATAKANA LETTER ZE
+<U30BD>     /xa5/xbd         KATAKANA LETTER SO
+<U30BE>     /xa5/xbe         KATAKANA LETTER ZO
+<U30BF>     /xa5/xbf         KATAKANA LETTER TA
+<U30C0>     /xa5/xc0         KATAKANA LETTER DA
+<U30C1>     /xa5/xc1         KATAKANA LETTER TI
+<U30C2>     /xa5/xc2         KATAKANA LETTER DI
+<U30C3>     /xa5/xc3         KATAKANA LETTER SMALL TU
+<U30C4>     /xa5/xc4         KATAKANA LETTER TU
+<U30C5>     /xa5/xc5         KATAKANA LETTER DU
+<U30C6>     /xa5/xc6         KATAKANA LETTER TE
 <U30C7>     /xa5/xc7         KATAKANA LETTER DE
 <U30C8>     /xa5/xc8         KATAKANA LETTER TO
 <U30C9>     /xa5/xc9         KATAKANA LETTER DO
@@ -7394,6 +7420,7 @@ CHARMAP
 <U3122>     /xa8/xe2         BOPOMOFO LETTER AN
 <U3123>     /xa8/xe3         BOPOMOFO LETTER EN
 <U3124>     /xa8/xe4         BOPOMOFO LETTER ANG
+<U3125>     /xa8/xe5         BOPOMOFO LETTER ENG
 <U3126>     /xa8/xe6         BOPOMOFO LETTER ER
 <U3127>     /xa8/xe7         BOPOMOFO LETTER I
 <U3128>     /xa8/xe8         BOPOMOFO LETTER U
@@ -7454,7 +7481,17 @@ CHARMAP
 <U3163>     /x81/x39/xae/x34 HANGUL LETTER I
 <U3164>     /x81/x39/xae/x35 HANGUL FILLER
 <U3165>     /x81/x39/xae/x36 HANGUL LETTER SSANGNIEUN
+<U3166>     /x81/x39/xae/x37 HANGUL LETTER NIEUN-TIKEUT
+<U3167>     /x81/x39/xae/x38 HANGUL LETTER NIEUN-SIOS
+<U3168>     /x81/x39/xae/x39 HANGUL LETTER NIEUN-PANSIOS
+<U3169>     /x81/x39/xaf/x30 HANGUL LETTER RIEUL-KIYEOK-SIOS
 <U316A>     /x81/x39/xaf/x31 HANGUL LETTER RIEUL-TIKEUT
+<U316B>     /x81/x39/xaf/x32 HANGUL LETTER RIEUL-PIEUP-SIOS
+<U316C>     /x81/x39/xaf/x33 HANGUL LETTER RIEUL-PANSIOS
+<U316D>     /x81/x39/xaf/x34 HANGUL LETTER RIEUL-YEORINHIEUH
+<U316E>     /x81/x39/xaf/x35 HANGUL LETTER MIEUM-PIEUP
+<U316F>     /x81/x39/xaf/x36 HANGUL LETTER MIEUM-SIOS
+<U3170>     /x81/x39/xaf/x37 HANGUL LETTER MIEUM-PANSIOS
 <U3171>     /x81/x39/xaf/x38 HANGUL LETTER KAPYEOUNMIEUM
 <U3172>     /x81/x39/xaf/x39 HANGUL LETTER PIEUP-KIYEOK
 <U3173>     /x81/x39/xb0/x30 HANGUL LETTER PIEUP-TIKEUT
@@ -7544,6 +7581,7 @@ CHARMAP
 <U3210>     /x81/x39/xbf/x37 PARENTHESIZED HANGUL TIKEUT A
 <U3211>     /x81/x39/xbf/x38 PARENTHESIZED HANGUL RIEUL A
 <U3212>     /x81/x39/xbf/x39 PARENTHESIZED HANGUL MIEUM A
+<U3213>     /x81/x39/xc0/x30 PARENTHESIZED HANGUL PIEUP A
 <U3214>     /x81/x39/xc0/x31 PARENTHESIZED HANGUL SIOS A
 <U3215>     /x81/x39/xc0/x32 PARENTHESIZED HANGUL IEUNG A
 <U3216>     /x81/x39/xc0/x33 PARENTHESIZED HANGUL CIEUC A
@@ -7585,6 +7623,7 @@ CHARMAP
 <U323D>     /x81/x39/xc3/x31 PARENTHESIZED IDEOGRAPH ENTERPRISE
 <U323E>     /x81/x39/xc3/x32 PARENTHESIZED IDEOGRAPH RESOURCE
 <U323F>     /x81/x39/xc3/x33 PARENTHESIZED IDEOGRAPH ALLIANCE
+<U3240>     /x81/x39/xc3/x34 PARENTHESIZED IDEOGRAPH FESTIVAL
 <U3241>     /x81/x39/xc3/x35 PARENTHESIZED IDEOGRAPH REST
 <U3242>     /x81/x39/xc3/x36 PARENTHESIZED IDEOGRAPH SELF
 <U3243>     /x81/x39/xc3/x37 PARENTHESIZED IDEOGRAPH REACH
@@ -7593,6 +7632,18 @@ CHARMAP
 <U3262>     /x81/x39/xc6/x38 CIRCLED HANGUL TIKEUT
 <U3263>     /x81/x39/xc6/x39 CIRCLED HANGUL RIEUL
 <U3264>     /x81/x39/xc7/x30 CIRCLED HANGUL MIEUM
+<U3265>     /x81/x39/xc7/x31 CIRCLED HANGUL PIEUP
+<U3266>     /x81/x39/xc7/x32 CIRCLED HANGUL SIOS
+<U3267>     /x81/x39/xc7/x33 CIRCLED HANGUL IEUNG
+<U3268>     /x81/x39/xc7/x34 CIRCLED HANGUL CIEUC
+<U3269>     /x81/x39/xc7/x35 CIRCLED HANGUL CHIEUCH
+<U326A>     /x81/x39/xc7/x36 CIRCLED HANGUL KHIEUKH
+<U326B>     /x81/x39/xc7/x37 CIRCLED HANGUL THIEUTH
+<U326C>     /x81/x39/xc7/x38 CIRCLED HANGUL PHIEUPH
+<U326D>     /x81/x39/xc7/x39 CIRCLED HANGUL HIEUH
+<U326E>     /x81/x39/xc8/x30 CIRCLED HANGUL KIYEOK A
+<U326F>     /x81/x39/xc8/x31 CIRCLED HANGUL NIEUN A
+<U3270>     /x81/x39/xc8/x32 CIRCLED HANGUL TIKEUT A
 <U3271>     /x81/x39/xc8/x33 CIRCLED HANGUL RIEUL A
 <U3272>     /x81/x39/xc8/x34 CIRCLED HANGUL MIEUM A
 <U3273>     /x81/x39/xc8/x35 CIRCLED HANGUL PIEUP A
@@ -7706,6 +7757,7 @@ CHARMAP
 <U32F5>     /x81/x39/xd5/x34 CIRCLED KATAKANA YO
 <U32F6>     /x81/x39/xd5/x35 CIRCLED KATAKANA RA
 <U32F7>     /x81/x39/xd5/x36 CIRCLED KATAKANA RI
+<U32F8>     /x81/x39/xd5/x37 CIRCLED KATAKANA RU
 <U32F9>     /x81/x39/xd5/x38 CIRCLED KATAKANA RE
 <U32FA>     /x81/x39/xd5/x39 CIRCLED KATAKANA RO
 <U32FB>     /x81/x39/xd6/x30 CIRCLED KATAKANA WA
@@ -15779,6 +15831,7 @@ CHARMAP
 <U52D1>     /x84/xd0         <CJK>
 <U52D2>     /xc0/xd5         <CJK>
 <U52D3>     /x84/xd1         <CJK>
+<U52D4>     /x84/xd2         <CJK>
 <U52D5>     /x84/xd3         <CJK>
 <U52D6>     /xdb/xc3         <CJK>
 <U52D7>     /x84/xd4         <CJK>
@@ -15898,6 +15951,10 @@ CHARMAP
 <U5349>     /xbb/xdc         <CJK>
 <U534A>     /xb0/xeb         <CJK>
 <U534B>     /x85/x62         <CJK>
+<U534C>     /x85/x63         <CJK>
+<U534D>     /x85/x64         <CJK>
+<U534E>     /xbb/xaa         <CJK>
+<U534F>     /xd0/xad         <CJK>
 <U5350>     /x85/x65         <CJK>
 <U5351>     /xb1/xb0         <CJK>
 <U5352>     /xd7/xe4         <CJK>
@@ -15997,6 +16054,8 @@ CHARMAP
 <U53B0>     /x85/x94         <CJK>
 <U53B1>     /x85/x95         <CJK>
 <U53B2>     /x85/x96         <CJK>
+<U53B3>     /x85/x97         <CJK>
+<U53B4>     /x85/x98         <CJK>
 <U53B5>     /x85/x99         <CJK>
 <U53B6>     /xdb/xcc         <CJK>
 <U53B7>     /x85/x9a         <CJK>
@@ -16028,6 +16087,7 @@ CHARMAP
 <U53D1>     /xb7/xa2         <CJK>
 <U53D2>     /x85/xaa         <CJK>
 <U53D3>     /x85/xab         <CJK>
+<U53D4>     /xca/xe5         <CJK>
 <U53D5>     /x85/xac         <CJK>
 <U53D6>     /xc8/xa1         <CJK>
 <U53D7>     /xca/xdc         <CJK>