diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-10-19 13:33:29 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-10-19 13:33:29 +0000 |
| commit | 816e6eb5a786594223586976c08e337bc08b6f4e (patch) | |
| tree | f40c1af0b36c777b5987dc6c888e9492518d14da /locale/programs/ld-collate.c | |
| parent | 685c167680a6d1040abc5ff33bd25e5f423f9405 (diff) | |
| download | glibc-816e6eb5a786594223586976c08e337bc08b6f4e.tar glibc-816e6eb5a786594223586976c08e337bc08b6f4e.tar.gz glibc-816e6eb5a786594223586976c08e337bc08b6f4e.tar.bz2 glibc-816e6eb5a786594223586976c08e337bc08b6f4e.zip | |
Update.
1998-10-19 13:24 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-collate.c (collate_startup): Clear bit for this
category in copy_posix.
(collate_finish): Don't warn about UNDEFINED not being defined.
* locale/programs/ld-ctype.c (ctype_startup): Clear bit for this
category in copy_posix.
* locale/programs/ld-messages.c (messages_startup): Likewise.
* locale/programs/ld-monetary.c (monetary_startup): Likewise.
* locale/programs/ld-numeric.c (numeric_startup): Likewise.
* locale/programs/ld-time.c (time_startup): Likewise.
* locale/programs/localedef.c: Move copy_def_list_t definition into
locales.h. Define copy_posix variable.
(main): Before processing copy list add ©_posix to copy_list.
* locale/programs/locales.h: Add definition of copy_def_list_t.
* locale/programs/locfile.c: Clear bit for appropriate category in
case of an copy instruction.
Diffstat (limited to 'locale/programs/ld-collate.c')
| -rw-r--r-- | locale/programs/ld-collate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index a92ff1154a..b9734c36dd 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -155,6 +155,9 @@ collate_startup (struct linereader *lr, struct localedef_t *locale, { struct locale_collate_t *collate; + /* We have a definition for LC_COLLATE. */ + copy_posix.mask &= ~(1 << LC_COLLATE); + /* It is important that we always use UCS4 encoding for strings now. */ encoding_method = ENC_UCS4; @@ -260,7 +263,7 @@ collate_finish (struct localedef_t *locale, struct charset_t *charset) \**************************************************************/ u_int32_t weight; - if (!be_quiet) + if (/* XXX Remove the 0 & */ 0 && !be_quiet) error (0, 0, _("no definition of `UNDEFINED'")); collate->undefined.ordering_len = collate->nrules; |