diff options
author | Roland McGrath <roland@gnu.org> | 1995-03-06 03:00:08 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1995-03-06 03:00:08 +0000 |
commit | 933e73facc338fb81f1f72af416ea57fbf439a2f (patch) | |
tree | 1a91e86bb27602a860b65afca47cbc6a38223df4 /locale/C-time.c | |
parent | 6408bdde65cac02ef96ae9f2b77f222b534c0e75 (diff) | |
download | glibc-933e73facc338fb81f1f72af416ea57fbf439a2f.tar.gz |
Sun Mar 5 19:40:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/localeinfo.h: Rewritten for new locale system, using
locale data files and with <langinfo.h> interface.
* locale/setlocale.c: Rewritten to use locale data files.
* langinfo.h: New file.
* locale/langinfo.h: New file.
* locale/nl_langinfo.c: New file.
* locale/loadlocale.c: New file.
* locale/lc-ctype.c: New file.
* locale/lc-messages.c: New file.
* locale/lc-monetary.c: New file.
* locale/lc-numeric.c: New file.
* locale/lc-time.c: New file.
* locale/categories.def: New file.
* locale/Makefile (headers): Remove localeinfo.h.
(distribute): New variable; put localeinfo.h here, and categories.def.
(routines): Add loadlocale.
(categories): New variable.
(aux): Use that to get C-category and lc-category.
* ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum.
* locale/C-ctype.c, locale/C-messages.c: New files.
* locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c:
Default "C" locale data updated for new locale system.
* locale/C-collate.c: File removed.
* locale/C-ctype_ct.c: File removed.
* locale/C-ctype_mb.c: File removed.
* locale/C-response.c: File removed.
* locale/localeconv.c: Use _NL_CURRENT macro to access locale data.
* stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c,
stdlib/strtod.c, time/asctime.c, time/strftime.c:
Include ../locale/localeinfo.h and use _NL_CURRENT macro to access
locale data.
* time/localtime.c: Don't include <localeinfo.h>.
* time/tzset.c: Don't use locale items for default TZ value or
"GMT" string (use "UTC").
* stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if
WIDTH>0; update DONE.
* malloc/malloc.c (morecore): Fix last change to calculate by
blocks instead of bytes.
Diffstat (limited to 'locale/C-time.c')
-rw-r--r-- | locale/C-time.c | 78 |
1 files changed, 55 insertions, 23 deletions
diff --git a/locale/C-time.c b/locale/C-time.c index 43930612ef..5329ae65fb 100644 --- a/locale/C-time.c +++ b/locale/C-time.c @@ -1,25 +1,57 @@ -/* Built-in time information for `C' locale, - generated Thu Jan 1 00:00:00 1970 by li2c. */ +/* Generated by GNU locale 0.1. + Copyright (C) 1995 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. +There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. */ -#include <ansidecl.h> -#include <localeinfo.h> -#include <stddef.h> +#include "localeinfo.h" - -CONST struct time_info __time_C = - { - { -(char *) "Sun", (char *) "Mon", (char *) "Tue", (char *) "Wed", (char *) "Thu", (char *) "Fri", (char *) "Sat", }, - - { -(char *) "Sunday", (char *) "Monday", (char *) "Tuesday", (char *) "Wednesday", (char *) "Thursday", (char *) "Friday", (char *) "Saturday", }, - { -(char *) "Jan", (char *) "Feb", (char *) "Mar", (char *) "Apr", (char *) "May", (char *) "Jun", (char *) "Jul", (char *) "Aug", (char *) "Sep", (char *) "Oct", (char *) "Nov", (char *) "Dec", }, - { -(char *) "January", (char *) "February", (char *) "March", (char *) "April", (char *) "May", (char *) "June", (char *) "July", (char *) "August", (char *) "September", (char *) "October", (char *) "November", (char *) "December", }, - { (char *) "AM", (char *) "PM" }, - (char *) "%a %b %d %H:%M:%S %Y", (char *) "%m/%d/%y", (char *) "%H:%M:%S", - (char *) "GMT", (char *) "" - }; - -CONST struct time_info *_time_info = &__time_C; +const struct locale_data _nl_C_LC_TIME = +{ + NULL, 0, /* no file mapped */ + 44, + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday", + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December", + "AM", + "PM", + "%a %b %d %H:%M:%S %Y", + "%m/%d/%y", + "%H:%M:%S", + NULL, +}; |