(my_strftime) [!defined _NL_CURRENT && HAVE_STRFTIME]: Use
authordrepper <drepper>
Fri, 13 Jun 2003 02:53:26 +0000 (02:53 +0000)
committerdrepper <drepper>
Fri, 13 Jun 2003 02:53:26 +0000 (02:53 +0000)
underlying_strftime for %r.

time/strftime.c

index 99bf7f6..d830205 100644 (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'))