1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
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>.
This commit is contained in:
Ulrich Drepper
2003-06-13 02:54:37 +00:00
parent 9d1e8e8e7c
commit b54aa55d36
4 changed files with 28 additions and 4 deletions

View File

@@ -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'))