diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 10:52:53 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 10:52:53 -0500 |
| commit | 9954432e309c8fddaec2fe53e601702a5c981624 (patch) | |
| tree | 3eb7513694e25391b3393afbb847dbd85ebf097a /iconv/iconv_prog.c | |
| parent | c3a87236702cb73be1dada3438bbd3c3934e83f8 (diff) | |
More char16_t and char32_t support
It works now for UTF-8 locales
Diffstat (limited to 'iconv/iconv_prog.c')
| -rw-r--r-- | iconv/iconv_prog.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 59c6402eb9..13facc8235 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -719,10 +719,12 @@ add_known_names (struct gconv_module *node) add_known_names (node->right); do { - if (strcmp (node->from_string, "INTERNAL")) + if (strcmp (node->from_string, "INTERNAL") != 0 + && strcmp (node->from_string, "CHAR16") != 0) tsearch (node->from_string, &printlist, (__compar_fn_t) strverscmp); - if (strcmp (node->to_string, "INTERNAL") != 0) + if (strcmp (node->to_string, "INTERNAL") != 0 + && strcmp (node->to_string, "CHAR16") != 0) tsearch (node->to_string, &printlist, (__compar_fn_t) strverscmp); node = node->same; @@ -748,7 +750,8 @@ insert_cache (void) { const char *str = strtab + hashtab[cnt].string_offset; - if (strcmp (str, "INTERNAL") != 0) + if (strcmp (str, "INTERNAL") != 0 + && strcmp (str, "CHAR16") != 0) tsearch (str, &printlist, (__compar_fn_t) strverscmp); } } |