View | Details | Raw Unified | Return to bug 10871 | Differences between
and this patch

Collapse All | Expand All

(-)a/locale/nl_langinfo_l.c (-1 / +13 lines)
Lines 81-87 attribute_compat_text_section Link Here
81
__nl_langinfo_noaltmon_l (nl_item item, locale_t l)
81
__nl_langinfo_noaltmon_l (nl_item item, locale_t l)
82
{
82
{
83
  if ((item >= ALTMON_1 && item <= ALTMON_12)
83
  if ((item >= ALTMON_1 && item <= ALTMON_12)
84
      || (item >= _NL_WALTMON_1 && item <= _NL_WALTMON_12))
84
      || (item >= _NL_WALTMON_1 && item <= _NL_WALTMON_12)
85
      || (item >= _NL_ABALTMON_1 && item <= _NL_ABALTMON_12)
86
      || (item >= _NL_WABALTMON_1 && item <= _NL_WABALTMON_12))
85
    /* Pretend it's a bogus index for this category: bogus item.  */
87
    /* Pretend it's a bogus index for this category: bogus item.  */
86
    return (char *) "";
88
    return (char *) "";
87
  else if (item >= MON_1 && item <= MON_12)
89
  else if (item >= MON_1 && item <= MON_12)
Lines 94-99 __nl_langinfo_noaltmon_l (nl_item item, locale_t l) Link Here
94
      /* The same for _NL_WALTMON_... and _NL_WMON_...  */
96
      /* The same for _NL_WALTMON_... and _NL_WMON_...  */
95
      return __nl_langinfo_l (item + _NL_WALTMON_1 - _NL_WMON_1, l);
97
      return __nl_langinfo_l (item + _NL_WALTMON_1 - _NL_WMON_1, l);
96
    }
98
    }
99
  else if (item >= ABMON_1 && item <= ABMON_12)
100
    {
101
      /* _NL_ABALTMON... item contains what ABMON_... item contained before.  */
102
      return __nl_langinfo_l (item + _NL_ABALTMON_1 - ABMON_1, l);
103
    }
104
  else if (item >= _NL_WABMON_1 && item <= _NL_WABMON_12)
105
    {
106
      /* The same for _NL_WABALTMON_... and _NL_WABMON_...  */
107
      return __nl_langinfo_l (item + _NL_WABALTMON_1 - _NL_WABMON_1, l);
108
    }
97
109
98
  /* Default result if it is not a month.  */
110
  /* Default result if it is not a month.  */
99
  return __nl_langinfo_l (item, l);
111
  return __nl_langinfo_l (item, l);
(-)a/time/strftime_l.c (-2 / +3 lines)
Lines 797-804 __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, Link Here
797
	    }
797
	    }
798
	  if (modifier == L_('E'))
798
	  if (modifier == L_('E'))
799
	    goto bad_format;
799
	    goto bad_format;
800
	  if (!feature_OB && modifier == L_('O'))
801
	    goto bad_format;
800
#if defined _NL_CURRENT || !HAVE_STRFTIME
802
#if defined _NL_CURRENT || !HAVE_STRFTIME
801
	  if (modifier == L_('O'))
803
	  if (!feature_OB || modifier == L_('O'))
802
	    cpy (aam_len, a_altmonth);
804
	    cpy (aam_len, a_altmonth);
803
	  else
805
	  else
804
	    cpy (am_len, a_month);
806
	    cpy (am_len, a_month);
805
- 

Return to bug 10871