diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-07-22 13:43:39 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-07-22 13:43:39 +0000 |
| commit | c837cf0bbdd09079d64188bf0028bb21df2faec7 (patch) | |
| tree | d3ead9b4b8d60f25f78b12417b2ba02f14971704 /libc/iconvdata | |
| parent | a63bdad03a9963d53373008e78fc29ee48f161af (diff) | |
Merge changes between 14282 and r14661 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@14662 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/iconvdata')
| -rw-r--r-- | libc/iconvdata/extra-module.mk | 2 | ||||
| -rw-r--r-- | libc/iconvdata/gb18030.c | 12 | ||||
| -rw-r--r-- | libc/iconvdata/johab.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libc/iconvdata/extra-module.mk b/libc/iconvdata/extra-module.mk index 163074fea..43f4e12fb 100644 --- a/libc/iconvdata/extra-module.mk +++ b/libc/iconvdata/extra-module.mk @@ -4,7 +4,7 @@ extra-modules-left := $(strip $(filter-out $(mod),$(extra-modules-left))) extra-objs := $(extra-objs) $(patsubst %,%.os,$($(mod)-routines)) $(objpfx)$(mod).so: $(addprefix $(objpfx),$(addsuffix .os,$($(mod)-routines)))\ - $(common-objpfx)shlib.lds + $(shlib-lds) $(build-module-asneeded) # Depend on libc.so so a DT_NEEDED is generated in the shared objects. diff --git a/libc/iconvdata/gb18030.c b/libc/iconvdata/gb18030.c index f2b23e66e..a06b75d03 100644 --- a/libc/iconvdata/gb18030.c +++ b/libc/iconvdata/gb18030.c @@ -18233,17 +18233,17 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] = len = 0; \ } \ else if (ch == 0x20087) \ - idx = 0xfe51; \ + cp = (const unsigned char *) "\xfe\x51"; \ else if (ch == 0x20089) \ - idx = 0xfe52; \ + cp = (const unsigned char *) "\xfe\x52"; \ else if (ch == 0x200CC) \ - idx = 0xfe53; \ + cp = (const unsigned char *) "\xfe\x53"; \ else if (ch == 0x215d7) \ - idx = 0xfe6c; \ + cp = (const unsigned char *) "\xfe\x6c"; \ else if (ch == 0x2298F) \ - idx = 0xfe76; \ + cp = (const unsigned char *) "\xfe\x76"; \ else if (ch == 0x241FE) \ - idx = 0xfe91; \ + cp = (const unsigned char *) "\xfe\x91"; \ else \ len = 0; \ \ diff --git a/libc/iconvdata/johab.c b/libc/iconvdata/johab.c index 58cb5bcc0..a2f6fc873 100644 --- a/libc/iconvdata/johab.c +++ b/libc/iconvdata/johab.c @@ -1,5 +1,5 @@ /* Mapping tables for JOHAB handling. - Copyright (C) 1998, 1999, 2000-2002, 2007 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2007, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin <jshin@pantheon.yale.edu> and Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -93,7 +93,7 @@ static const int init_to_bit[19] = static const int mid_to_bit[21] = { - 0x0060, 0x0080, 0x00a0, 0x00c0, 0x00e0, + 0x0060, 0x0080, 0x00a0, 0x00c0, 0x00e0, 0x0140, 0x0160, 0x0180, 0x01a0, 0x01c0, 0x1e0, 0x0240, 0x0260, 0x0280, 0x02a0, 0x02c0, 0x02e0, 0x0340, 0x0360, 0x0380, 0x03a0 @@ -132,7 +132,7 @@ static const uint16_t jamo_from_ucs_table[51] = }; -static inline uint32_t +static uint32_t johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) { if (idx <= 0xdefe) @@ -255,7 +255,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) + ch2 - (ch2 > 0x90 \ ? 0x43 : 0x31)]; \ else \ - ch = __ksc5601_hanja_to_ucs[(ch - 0xe0) *192 \ + ch = __ksc5601_hanja_to_ucs[(ch - 0xe0) *192 \ + ch2 - (ch2 > 0x90 \ ?0x43 : 0x31)];\ */ \ |