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/locfile.c | |
| parent | 685c167680a6d1040abc5ff33bd25e5f423f9405 (diff) | |
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/locfile.c')
| -rw-r--r-- | locale/programs/locfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c index 5a3fc25e3d..0485b61645 100644 --- a/locale/programs/locfile.c +++ b/locale/programs/locfile.c @@ -116,6 +116,7 @@ locfile_read (const char *filename, struct charset_t *charset) #define HANDLE_COPY(category, token, string) \ if (nowtok == tok_copy) \ { \ + copy_posix.mask &= ~(1 << category); \ copy_category = category; \ expected_tok = token; \ expected_str = string; \ |