diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | bits/confname.h | 2 | ||||
| -rw-r--r-- | iconv/gconv.h | 2 | ||||
| -rw-r--r-- | localedata/ChangeLog | 3 | ||||
| -rw-r--r-- | localedata/charmaps/ISO-8859-15 | 2 | ||||
| -rw-r--r-- | sysdeps/generic/bits/confname.h | 2 |
6 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index d95137041a..ddf2240bf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-05-04 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/generic/bits/confname.h (_SC* enum): Avoid comma at the + end of enum. + +2000-05-04 Jakub Jelinek <jakub@redhat.com> + + * iconv/gconv.h (__gconv_t): Add __extension__ to make gcc -pedantic + happy. + 2000-04-11 Geoff Keating <geoffk@cygnus.com> * sysdeps/powerpc/dl-start.S (_dl_start): Add _dl_start_user diff --git a/bits/confname.h b/bits/confname.h index 3c4dbdb98c..80a2eda0af 100644 --- a/bits/confname.h +++ b/bits/confname.h @@ -420,7 +420,7 @@ enum #define _SC_PBS_MESSAGE _SC_PBS_MESSAGE _SC_PBS_TRACK, #define _SC_PBS_TRACK _SC_PBS_TRACK - _SC_SYMLOOP, + _SC_SYMLOOP #define _SC_SYMLOOP _SC_SYMLOOP }; diff --git a/iconv/gconv.h b/iconv/gconv.h index 6d79b07ddd..804d8daca2 100644 --- a/iconv/gconv.h +++ b/iconv/gconv.h @@ -124,7 +124,7 @@ typedef struct __gconv_info { size_t __nsteps; struct __gconv_step *__steps; - struct __gconv_step_data __data[0]; + __extension__ struct __gconv_step_data __data[0]; } *__gconv_t; #endif /* gconv.h */ diff --git a/localedata/ChangeLog b/localedata/ChangeLog index f45e52faa7..d4ffc86e40 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,8 @@ 2000-05-04 Ulrich Drepper <drepper@redhat.com> + * charmaps/ISO-8859-15: Remove incorrect definitions of <So> and <OR>. + Reported by Gaël Quéri <gqueri@mail.dotcom.fr> [PR libc/1718]. + * tst-fmon.c (main): Print the locale name as well in the error message. diff --git a/localedata/charmaps/ISO-8859-15 b/localedata/charmaps/ISO-8859-15 index 937aaa0a02..2d1778ab01 100644 --- a/localedata/charmaps/ISO-8859-15 +++ b/localedata/charmaps/ISO-8859-15 @@ -261,7 +261,6 @@ CHARMAP <Y-> /xA5 <U00A5> YEN SIGN <Ye> /xA5 <U00A5> YEN SIGN <S<> /xA6 <U0160> LATIN CAPITAL LETTER S WITH CARON -<So> /xA7 <U00A7> SECTION SIGN <SE> /xA7 <U00A7> SECTION SIGN <s<> /xA8 <U0161> LATIN SMALL LETTER S WITH CARON <Co> /xA9 <U00A9> COPYRIGHT SIGN @@ -271,7 +270,6 @@ CHARMAP <7!> /xAC <U00AC> NOT SIGN <--> /xAD <U00AD> SOFT HYPHEN <Rg> /xAE <U00AE> REGISTERED SIGN -<OR> /xAE <U00AE> REGISTERED SIGN <'m> /xAF <U00AF> MACRON <DG> /xB0 <U00B0> DEGREE SIGN <+-> /xB1 <U00B1> PLUS-MINUS SIGN diff --git a/sysdeps/generic/bits/confname.h b/sysdeps/generic/bits/confname.h index 3c4dbdb98c..80a2eda0af 100644 --- a/sysdeps/generic/bits/confname.h +++ b/sysdeps/generic/bits/confname.h @@ -420,7 +420,7 @@ enum #define _SC_PBS_MESSAGE _SC_PBS_MESSAGE _SC_PBS_TRACK, #define _SC_PBS_TRACK _SC_PBS_TRACK - _SC_SYMLOOP, + _SC_SYMLOOP #define _SC_SYMLOOP _SC_SYMLOOP }; |