From b54aa55d36ab28db6d505bf34626a9ac4b639495 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 13 Jun 2003 02:54:37 +0000 Subject: Update. 2003-05-29 Jim Meyering * time/strftime.c (my_strftime) [!defined _NL_CURRENT && HAVE_STRFTIME]: Use underlying_strftime for %r. Suggested by Daniel Yacob . --- time/strftime.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'time') 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')) -- cgit v1.2.3