diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-01-09 10:56:41 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-01-09 10:56:41 -0800 |
| commit | f095bb7204d80f609a73a22796edd6cffd4c6add (patch) | |
| tree | 2b909bba9e4857eaee4761cacc16a69e7ecd480a /locale/loadlocale.c | |
| parent | 44dcc00292b965b3b6bff8415175d6a3e290aab7 (diff) | |
| download | glibc-f095bb7204d80f609a73a22796edd6cffd4c6add.zip glibc-f095bb7204d80f609a73a22796edd6cffd4c6add.tar.gz glibc-f095bb7204d80f609a73a22796edd6cffd4c6add.tar.bz2 | |
Add support for XPG7 testing.
The header conformance testing code needed extending for XPG7. This
exposed a few bugs in the headers. There are more changes to come.
Diffstat (limited to 'locale/loadlocale.c')
| -rw-r--r-- | locale/loadlocale.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/locale/loadlocale.c b/locale/loadlocale.c index 467dff1..6ef25b0 100644 --- a/locale/loadlocale.c +++ b/locale/loadlocale.c @@ -1,5 +1,5 @@ /* Functions to read locale data files. - Copyright (C) 1996-2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1996-2004, 2005, 2006, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -61,7 +61,7 @@ static const enum value_type *const _nl_value_types[] = }; -struct locale_data * +struct __locale_data * internal_function _nl_intern_locale_data (int category, const void *data, size_t datasize) { @@ -71,7 +71,7 @@ _nl_intern_locale_data (int category, const void *data, size_t datasize) unsigned int nstrings; unsigned int strindex[0]; } *const filedata = data; - struct locale_data *newdata; + struct __locale_data *newdata; size_t cnt; if (__builtin_expect (datasize < sizeof *filedata, 0) @@ -166,7 +166,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) int fd; void *filedata; struct stat64 st; - struct locale_data *newdata; + struct __locale_data *newdata; int save_err; int alloc = ld_mapped; @@ -187,7 +187,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) if (__builtin_expect (S_ISDIR (st.st_mode), 0)) { /* LOCALE/LC_foo is a directory; open LOCALE/LC_foo/SYS_LC_foo - instead. */ + instead. */ char *newp; size_t filenamelen; @@ -282,7 +282,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) void internal_function -_nl_unload_locale (struct locale_data *locale) +_nl_unload_locale (struct __locale_data *locale) { if (locale->private.cleanup) (*locale->private.cleanup) (locale); |