diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/C-collate.c | 4 | ||||
| -rw-r--r-- | locale/categories.def | 1 | ||||
| -rw-r--r-- | locale/langinfo.h | 1 | ||||
| -rw-r--r-- | locale/localeinfo.h | 8 | ||||
| -rw-r--r-- | locale/programs/ld-collate.c | 9 |
5 files changed, 1 insertions, 22 deletions
diff --git a/locale/C-collate.c b/locale/C-collate.c index d7f3c550a5..06dfdfaad5 100644 --- a/locale/C-collate.c +++ b/locale/C-collate.c @@ -144,8 +144,6 @@ const struct __locale_data _nl_C_LC_COLLATE attribute_hidden = /* _NL_COLLATE_COLLSEQWC */ { .string = (const char *) collseqwc }, /* _NL_COLLATE_CODESET */ - { .string = _nl_C_codeset }, - /* _NL_COLLATE_ENCODING_TYPE */ - { .word = __cet_8bit } + { .string = _nl_C_codeset } } }; diff --git a/locale/categories.def b/locale/categories.def index 045489d741..a8dda53007 100644 --- a/locale/categories.def +++ b/locale/categories.def @@ -58,7 +58,6 @@ DEFINE_CATEGORY DEFINE_ELEMENT (_NL_COLLATE_COLLSEQMB, "collate-collseqmb", std, wstring) DEFINE_ELEMENT (_NL_COLLATE_COLLSEQWC, "collate-collseqwc", std, wstring) DEFINE_ELEMENT (_NL_COLLATE_CODESET, "collate-codeset", std, string) - DEFINE_ELEMENT (_NL_COLLATE_ENCODING_TYPE, "collate-encoding-type", std, word) ), NO_POSTLOAD) diff --git a/locale/langinfo.h b/locale/langinfo.h index ffc5c7f471..a565d9d120 100644 --- a/locale/langinfo.h +++ b/locale/langinfo.h @@ -255,7 +255,6 @@ enum _NL_COLLATE_COLLSEQMB, _NL_COLLATE_COLLSEQWC, _NL_COLLATE_CODESET, - _NL_COLLATE_ENCODING_TYPE, _NL_NUM_LC_COLLATE, /* LC_CTYPE category: character classification. diff --git a/locale/localeinfo.h b/locale/localeinfo.h index 434b839b61..789da449f6 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -110,14 +110,6 @@ enum coll_sort_rule sort_mask }; -/* Collation encoding type. */ -enum collation_encoding_type -{ - __cet_other, - __cet_8bit, - __cet_utf8 -}; - /* We can map the types of the entries into a few categories. */ enum value_type { diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index a39a94f2cc..dc0fe30a13 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -32,7 +32,6 @@ #include "linereader.h" #include "locfile.h" #include "elem-hash.h" -#include "../localeinfo.h" /* Uncomment the following line in the production version. */ /* #define NDEBUG 1 */ @@ -2131,8 +2130,6 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, /* The words have to be handled specially. */ if (idx == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_HASH_SIZEMB)) add_locale_uint32 (&file, 0); - else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_ENCODING_TYPE)) - add_locale_uint32 (&file, __cet_other); else add_locale_empty (&file); } @@ -2496,12 +2493,6 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, add_locale_raw_data (&file, collate->mbseqorder, 256); add_locale_collseq_table (&file, &collate->wcseqorder); add_locale_string (&file, charmap->code_set_name); - if (strcmp (charmap->code_set_name, "UTF-8") == 0) - add_locale_uint32 (&file, __cet_utf8); - else if (charmap->mb_cur_max == 1) - add_locale_uint32 (&file, __cet_8bit); - else - add_locale_uint32 (&file, __cet_other); write_locale_data (output_path, LC_COLLATE, "LC_COLLATE", &file); obstack_free (&weightpool, NULL); |