diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/charmaps/ISO-8859-15 | 1 | ||||
| -rw-r--r-- | time/strftime.c | 1 | ||||
| -rw-r--r-- | time/strptime.c | 1 |
5 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 69c03f7ae3..91ac996f43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-08-31 Ulrich Drepper <drepper@cygnus.com> + + * time/strftime.c (my_strftime): Remove unneeded variable len. + + * time/strptime.c: Undo last change. + 1999-08-30 Ulrich Drepper <drepper@cygnus.com> * locale/Makefile (distribute): Add iso-639.def and iso-3166.def. diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 8c11714ec5..ba93c4e8ca 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +1999-08-31 Ulrich Drepper <drepper@cygnus.com> + + * charmaps/ISO-8859-15: Remove duplicate <OC>. + 1999-08-16 Ulrich Drepper <drepper@cygnus.com> * charmaps/CP1258: Remove spurious <percent-sign/> entry. diff --git a/localedata/charmaps/ISO-8859-15 b/localedata/charmaps/ISO-8859-15 index 087e9c22d8..937aaa0a02 100644 --- a/localedata/charmaps/ISO-8859-15 +++ b/localedata/charmaps/ISO-8859-15 @@ -265,7 +265,6 @@ CHARMAP <SE> /xA7 <U00A7> SECTION SIGN <s<> /xA8 <U0161> LATIN SMALL LETTER S WITH CARON <Co> /xA9 <U00A9> COPYRIGHT SIGN -<OC> /xA9 <U00A9> COPYRIGHT SIGN <-a> /xAA <U00AA> FEMININE ORDINAL INDICATOR <<<> /xAB <U00AB> LEFT-POINTING DOUBLE ANGLE QUOTATION MARK <NO> /xAC <U00AC> NOT SIGN diff --git a/time/strftime.c b/time/strftime.c index 9ad16b2372..995a6d9f8f 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -1202,7 +1202,6 @@ my_strftime (s, maxsize, format, tp ut_argument) /* The wide name is after the single byte name and format. */ char *tcp = strchr (era->name_fmt, '\0') + 1; - size_t len; subfmt = (wchar_t *) (strchr (tcp, '\0') + 1); subfmt = wcschr (subfmt, L'\0') + 1; # else diff --git a/time/strptime.c b/time/strptime.c index 20b39dbfe3..5f8271e250 100644 --- a/time/strptime.c +++ b/time/strptime.c @@ -156,6 +156,7 @@ localtime_r (t, tp) #ifdef _LIBC /* This is defined in locale/C-time.c in the GNU libc. */ +extern const struct locale_data _nl_C_LC_TIME; extern const unsigned short int __mon_yday[2][13]; # define weekday_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (DAY_1)].string) |