From 07dab0c38525997dc9984f583a71f3b1cbd44cbd Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 25 Jun 2000 18:14:28 +0000 Subject: Update. 2000-06-25 Ulrich Drepper * locale/programs/ld-collate.c: Correct handling of different collation sections. * locale/programs/localedef.c (add_to_readlist): Take locale pointer as extra parameter from which to copy category information. Change all callers. (load_locale): Likewise. * locale/programs/localedef.h: Update prototypes of add_to_readlist and load_locale. * locale/programs/ld-ctype.c: Update call to add_to_readlist. * locale/programs/locfile.h: Likewise. * locale/programs/locfile-kw.gperf: Add entry for script. * locale/programs/locfile-token.h: Add tok_script. * locale/programs/locale.c: Update copyright year. * locale/programs/localedef.c: Likewise. * xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from Jens --- locale/programs/localedef.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'locale/programs/localedef.h') diff --git a/locale/programs/localedef.h b/locale/programs/localedef.h index 4f8a103fd9..ac25d979ac 100644 --- a/locale/programs/localedef.h +++ b/locale/programs/localedef.h @@ -1,5 +1,5 @@ /* General definitions for localedef(1). - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -124,7 +124,8 @@ extern char *xstrdup (const char *__str); /* Mark given locale as to be read. */ extern struct localedef_t *add_to_readlist (int locale, const char *name, const char *repertoire_name, - int generate); + int generate, + struct localedef_t *copy_locale); /* Find the information for the locale NAME. */ extern struct localedef_t *find_locale (int locale, const char *name, @@ -134,6 +135,7 @@ extern struct localedef_t *find_locale (int locale, const char *name, /* Load (if necessary) the information for the locale NAME. */ extern struct localedef_t *load_locale (int locale, const char *name, const char *repertoire_name, - struct charmap_t *charmap); + struct charmap_t *charmap, + struct localedef_t *copy_locale); #endif /* localedef.h */ -- cgit v1.2.3