From 958d68077b3fa1435c010711876a9229e5cd4192 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 21 Dec 1999 17:50:57 +0000 Subject: Update. 1999-12-21 Shinya Hanataka * locale/lc-time.c: Extend structure era_entry. * locale/localeinfo.h: Likewise. * locale/lc-time.c: Handle '-' direction used in locale's era part properly. * time/strptime.c: Likewise. * time/strftime.c: Likewise. * locale/programs/ld-time.c: Consider negative values in era part of locale as B.C.. * time/strptime.c (strptime_internal): Merged Yoshiyama's %E[CyY] implementation. 1999-12-21 Akira Yoshiyama * time/strptime.c (strptime_internal): Fix segV bugs of a couple of recursive() call. * time/strptime.c (strptime_internal): Implement `%EC',`%Ey',`%EY' parsing. 1999-12-21 Ulrich Drepper * sysdeps/arm/dl-machine.c (CLEAR_CACHE): Fix a2 value. Patch by Scott Bambrough . --- locale/localeinfo.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'locale/localeinfo.h') diff --git a/locale/localeinfo.h b/locale/localeinfo.h index ee402dbf9f..c72ea9d84d 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -107,7 +107,14 @@ struct era_entry int32_t offset; int32_t start_date[3]; int32_t stop_date[3]; - const char name_fmt[0]; + const char *era_name; + const char *era_format; + const wchar_t *era_wname; + const wchar_t *era_wformat; + int absolute_direction; + /* absolute direction: + +1 indicates that year number is higher in the future. (like A.D.) + -1 indicates that year number is higher in the past. (like B.C.) */ }; @@ -160,17 +167,14 @@ extern void _nl_unload_locale (struct locale_data *locale); extern void _nl_remove_locale (int locale, struct locale_data *data); +/* initialize `era' entries */ +extern void _nl_init_era_entries (void); + /* Return `era' entry which corresponds to TP. Used in strftime. */ extern struct era_entry *_nl_get_era_entry (const struct tm *tp); -/* Return `era' string of the cnt'th `category' entry. */ -extern const void *_nl_get_era_nf_entry (int cnt, int category); - -/* Return a offset of `era' year of the cnt'th entry. */ -extern int _nl_get_era_year_offset (int cnt, int category); - -/* Return a start of `era' year of the cnt'th entry. */ -extern int _nl_get_era_year_start (int cnt); +/* Return `era' cnt'th entry . Used in strptime. */ +extern struct era_entry *_nl_select_era_entry (int cnt); /* Return `alt_digit' which corresponds to NUMBER. Used in strftime. */ extern const char *_nl_get_alt_digit (unsigned int number); -- cgit v1.2.3