diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | iconvdata/johab.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 8ad847a6d9..38bfec42fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-06-30 Marek Polacek <mpolacek@redhat.com> + + * iconvdata/johab.c: Don't inline `johab_sym_hanja_to_ucs' function. + 2011-06-21 Andreas Jaeger <aj@suse.de> * sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules): diff --git a/iconvdata/johab.c b/iconvdata/johab.c index 58cb5bcc0d..a2f6fc8734 100644 --- a/iconvdata/johab.c +++ b/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)];\ */ \ |