diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-06-13 02:54:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-13 02:54:37 +0000 |
| commit | b54aa55d36ab28db6d505bf34626a9ac4b639495 (patch) | |
| tree | 61e6d2f80240903b52e15d91743df24ded22c3b0 /time/strftime.c | |
| parent | 9d1e8e8e7c94204a16ba48d1520b0cb5fe9c2293 (diff) | |
| download | glibc-b54aa55d36ab28db6d505bf34626a9ac4b639495.tar glibc-b54aa55d36ab28db6d505bf34626a9ac4b639495.tar.gz glibc-b54aa55d36ab28db6d505bf34626a9ac4b639495.tar.bz2 glibc-b54aa55d36ab28db6d505bf34626a9ac4b639495.zip | |
Update.
2003-05-29 Jim Meyering <jim@meyering.net>
* time/strftime.c (my_strftime) [!defined _NL_CURRENT
&& HAVE_STRFTIME]: Use underlying_strftime for %r.
Suggested by Daniel Yacob <locales@geez.org>.
Diffstat (limited to 'time/strftime.c')
| -rw-r--r-- | time/strftime.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/time/strftime.c b/time/strftime.c index 99bf7f6f12..d83020563e 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -1144,13 +1144,17 @@ my_strftime (s, maxsize, format, tp ut_argument LOCALE_PARAM) goto subformat; case L_('r'): -#ifdef _NL_CURRENT +#if !defined _NL_CURRENT && HAVE_STRFTIME + goto underlying_strftime; +#else +# ifdef _NL_CURRENT if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT_AMPM))) == L_('\0')) -#endif +# endif subfmt = L_("%I:%M:%S %p"); goto subformat; +#endif case L_('S'): if (modifier == L_('E')) |