aboutsummaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-05-05 05:47:53 +0000
committerUlrich Drepper <drepper@redhat.com>2000-05-05 05:47:53 +0000
commit61d357cae37d7d84afa50bdba12dcf177980e7bf (patch)
treecb9f74682e77f817cf03ccbd6e83ac4ba1f31690 /localedata
parent7ee0c09d61eb834813377c54f10b000020edd375 (diff)
downloadglibc-61d357cae37d7d84afa50bdba12dcf177980e7bf.zip
glibc-61d357cae37d7d84afa50bdba12dcf177980e7bf.tar.gz
glibc-61d357cae37d7d84afa50bdba12dcf177980e7bf.tar.bz2
Update.
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.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog3
-rw-r--r--localedata/charmaps/ISO-8859-152
2 files changed, 3 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index f45e52f..d4ffc86 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 937aaa0..2d1778a 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