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 /time/asctime.c | |
| parent | 6408bdde65cac02ef96ae9f2b77f222b534c0e75 (diff) | |
| download | glibc-933e73facc338fb81f1f72af416ea57fbf439a2f.tar glibc-933e73facc338fb81f1f72af416ea57fbf439a2f.tar.gz glibc-933e73facc338fb81f1f72af416ea57fbf439a2f.tar.bz2 glibc-933e73facc338fb81f1f72af416ea57fbf439a2f.zip | |
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 'time/asctime.c')
| -rw-r--r-- | time/asctime.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/time/asctime.c b/time/asctime.c index 3337c74388..644df3277f 100644 --- a/time/asctime.c +++ b/time/asctime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <ansidecl.h> -#include <localeinfo.h> +#include "../locale/localeinfo.h" #include <errno.h> #include <stdio.h> #include <time.h> @@ -39,9 +39,9 @@ DEFUN(asctime, (tp), CONST struct tm *tp) if (sprintf (result, format, (tp->tm_wday < 0 || tp->tm_wday >= 7 ? - "???" : _time_info->abbrev_wkday[tp->tm_wday]), + "???" : _NL_CURRENT (LC_TIME, ABDAY_1 + tp->tm_wday)), (tp->tm_mon < 0 || tp->tm_mon >= 12 ? - "???" : _time_info->abbrev_month[tp->tm_mon]), + "???" : _NL_CURRENT (LC_TIME, ABMON_1 + tp->tm_mon)), tp->tm_mday, tp->tm_hour, tp->tm_min, tp->tm_sec, 1900 + tp->tm_year) < 0) return NULL; |