diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | localedata/charmaps/CP1258 | 1 | ||||
-rw-r--r-- | localedata/charmaps/IBM864 | 6 | ||||
-rw-r--r-- | localedata/charmaps/IBM874 | 1 | ||||
-rw-r--r-- | localedata/charmaps/ISO-8859-7 | 2 | ||||
-rw-r--r-- | localedata/charmaps/KOI8-R | 2 | ||||
-rw-r--r-- | localedata/charmaps/KOI8-U | 2 | ||||
-rw-r--r-- | localedata/repertoiremaps/mnemonic.ds | 8 | ||||
-rw-r--r-- | string/bits/string2.h | 14 |
9 files changed, 32 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index d11c0d18a8..8872df83b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-12-07 Jakub Jelinek <jakub@redhat.com> + + * string/bits/string2.h (__memset_gc, __mempcpy_small, __strcpy_small, + __stpcpy_small): Cast switch expressions to int to shut up compiler + warnings. + 1999-12-07 Scott Bambrough <scottb@netwinder.org> * sysdeps/arm/dl-machine.h (elf_machine_rel): Fixup R_ARM_PC24 diff --git a/localedata/charmaps/CP1258 b/localedata/charmaps/CP1258 index de6aaf93bf..de67c87972 100644 --- a/localedata/charmaps/CP1258 +++ b/localedata/charmaps/CP1258 @@ -325,6 +325,7 @@ CHARMAP <e'> /xE9 <U00E9> LATIN SMALL LETTER E WITH ACUTE <e/>> /xEA <U00EA> LATIN SMALL LETTER E WITH CIRCUMFLEX <e:> /xEB <U00EB> LATIN SMALL LETTER E WITH DIAERESIS +<"'> /xEC <U0301> COMBINING ACUTE ACCENT <i'> /xED <U00ED> LATIN SMALL LETTER I WITH ACUTE <i/>> /xEE <U00EE> LATIN SMALL LETTER I WITH CIRCUMFLEX <i:> /xEF <U00EF> LATIN SMALL LETTER I WITH DIAERESIS diff --git a/localedata/charmaps/IBM864 b/localedata/charmaps/IBM864 index c647ce9164..fdef1cd4e1 100644 --- a/localedata/charmaps/IBM864 +++ b/localedata/charmaps/IBM864 @@ -80,6 +80,7 @@ CHARMAP <!S> /x24 <U0024> DOLLAR SIGN <DO> /x24 <U0024> DOLLAR SIGN <dollar-sign> /x24 <U0024> DOLLAR SIGN +<%a> /x25 <U066A> ARABIC PERCENT SIGN <&> /x26 <U0026> AMPERSAND <ampersand> /x26 <U0026> AMPERSAND <'> /x27 <U0027> APOSTROPHE @@ -292,7 +293,12 @@ CHARMAP <?+> /xBF <U061F> ARABIC QUESTION MARK <Ct> /xC0 <U00A2> CENT SIGN <!C> /xC0 <U00A2> CENT SIGN +<H'-> /xC1 <UFE80> ARABIC LETTER HAMZA ISOLATED FORM +<aM-> /xC2 <UFE81> ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM +<aH-> /xC3 <UFE83> ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM +<wH-> /xC4 <UFE85> ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM <e+.> /xC5 <UFECA> ARABIC LETTER AIN FINAL FORM +<yH,> /xC6 <UFE8D> ARABIC LETTER ALEF ISOLATED FORM <a+-> /xC7 <UFE8D> ARABIC LETTER ALEF ISOLATED FORM <b+,> /xC8 <UFE91> ARABIC LETTER BEH INITIAL FORM <tm-> /xC9 <UFE93> ARABIC LETTER TEH MARBUTA ISOLATED FORM diff --git a/localedata/charmaps/IBM874 b/localedata/charmaps/IBM874 index 3ef0573fe0..677e1ea199 100644 --- a/localedata/charmaps/IBM874 +++ b/localedata/charmaps/IBM874 @@ -220,6 +220,7 @@ CHARMAP <tilde> /x7E <U007E> TILDE <DEL> /x7F <U007F> DELETE <DT> /x7F <U007F> DELETE +<Eu> /x80 <U20AC> EURO SIGN <.3> /x85 <U2026> HORIZONTAL ELLIPSIS <'6> /x91 <U2018> LEFT SINGLE QUOTATION MARK <'9> /x92 <U2019> RIGHT SINGLE QUOTATION MARK diff --git a/localedata/charmaps/ISO-8859-7 b/localedata/charmaps/ISO-8859-7 index e602ec6983..aeab854f3b 100644 --- a/localedata/charmaps/ISO-8859-7 +++ b/localedata/charmaps/ISO-8859-7 @@ -189,7 +189,7 @@ CHARMAP <+-> /xB1 <U00B1> PLUS-MINUS SIGN <2S> /xB2 <U00B2> SUPERSCRIPT TWO <3S> /xB3 <U00B3> SUPERSCRIPT THREE -<''> /xB4 <U00B4> ACUTE ACCENT +<'*> /xB4 <U0384> GREEK TONOS <'%> /xB5 <U0385> GREEK DIALYTIKA TONOS <A%> /xB6 <U0386> GREEK CAPITAL LETTER ALPHA WITH TONOS <.M> /xB7 <U00B7> MIDDLE DOT diff --git a/localedata/charmaps/KOI8-R b/localedata/charmaps/KOI8-R index 2ff2d43af1..507c1c82e9 100644 --- a/localedata/charmaps/KOI8-R +++ b/localedata/charmaps/KOI8-R @@ -157,7 +157,7 @@ CHARMAP <?S> /x92 <U2593> DARK SHADE <Iu> /x93 <U2320> TOP HALF INTEGRAL <fS> /x94 <U25A0> BLACK SQUARE -<sb> /x95 <U2022> BULLET +<Sb> /x95 <U2219> BULLET OPERATOR <RT> /x96 <U221A> SQUARE ROOT <?2> /x97 <U2248> ALMOST EQUAL TO <=<> /x98 <U2264> LESS-THAN OR EQUAL TO diff --git a/localedata/charmaps/KOI8-U b/localedata/charmaps/KOI8-U index 12fd0a7eed..d860962084 100644 --- a/localedata/charmaps/KOI8-U +++ b/localedata/charmaps/KOI8-U @@ -156,7 +156,7 @@ CHARMAP <?S> /x92 <U2593> DARK SHADE <Iu> /x93 <U2320> TOP HALF INTEGRAL <fS> /x94 <U25A0> BLACK SQUARE -<Sb> /x95 <U2019> BULLET OPERATOR +<Sb> /x95 <U2219> BULLET OPERATOR <RT> /x96 <U221A> SQUARE ROOT <?2> /x97 <U2248> ALMOST EQUAL TO <=<> /x98 <U2264> LESS THAN OR EQUAL TO diff --git a/localedata/repertoiremaps/mnemonic.ds b/localedata/repertoiremaps/mnemonic.ds index e64bed9ab6..c05332f620 100644 --- a/localedata/repertoiremaps/mnemonic.ds +++ b/localedata/repertoiremaps/mnemonic.ds @@ -589,6 +589,8 @@ escape_char / <';> <U02DB> OGONEK <1?> <U02DC> SMALL TILDE <'"> <U02DD> DOUBLE ACUTE ACCENT +<"`> <U0300> COMBINING GRAVE ACCENT +<"'> <U0301> COMBINING ACUTE ACCENT <'G> <U0374> GREEK NUMERAL SIGN <,G> <U0375> GREEK LOWER NUMERAL SIGN <j3> <U037A> GREEK YPOGEGRAMMENI @@ -859,6 +861,7 @@ escape_char / <7a> <U0667> ARABIC-INDIC DIGIT SEVEN <8a> <U0668> ARABIC-INDIC DIGIT EIGHT <9a> <U0669> ARABIC-INDIC DIGIT NINE +<%a> <U066A> ARABIC PERCENT SIGN <aS> <U0670> ARABIC LETTER SUPERSCRIPT ALEF <p+> <U067E> ARABIC LETTER PEH <hH> <U0681> ARABIC LETTER HAH WITH HAMZA ABOVE @@ -2173,9 +2176,14 @@ escape_char / <St> <UFB05> LATIN SMALL LIGATURE LONG S T <st> <UFB06> LATIN SMALL LIGATURE ST <3+;> <UFE7D> ARABIC SHADDA MEDIAL FORM +<H'-> <UFE80> ARABIC LETTER HAMZA ISOLATED FORM +<aM-> <UFE81> ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM <aM.> <UFE82> ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM +<aH-> <UFE83> ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM <aH.> <UFE84> ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM +<wH-> <UFE85> ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM <ah.> <UFE88> ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM +<yH,> <UFE8B> ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM <a+-> <UFE8D> ARABIC LETTER ALEF ISOLATED FORM <a+.> <UFE8E> ARABIC LETTER ALEF FINAL FORM <b+-> <UFE8F> ARABIC LETTER BEH ISOLATED FORM diff --git a/string/bits/string2.h b/string/bits/string2.h index 5c4777d99b..4d1baa2062 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -118,7 +118,7 @@ __STRING2_COPY_TYPE (8); __uint8_t __c = (__uint8_t) (c); \ \ /* This `switch' statement will be removed at compile-time. */ \ - switch (n) \ + switch ((unsigned int) n) \ { \ case 15: \ __u->__ui = __c * 0x01010101; \ @@ -230,7 +230,7 @@ __mempcpy_small (void *__dest1, unsigned char __uc; unsigned char __c; } *__u = __dest1; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__c = __src0_1; @@ -332,7 +332,7 @@ __mempcpy_small (void *__dest, char __src1, __STRING2_COPY_ARR7 __sca7; __STRING2_COPY_ARR8 __sca8; } *__u = __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__c = __src1; @@ -405,7 +405,7 @@ __strcpy_small (char *__dest, __uint16_t __usi; unsigned char __uc; } *__u = (void *) __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__uc = '\0'; @@ -498,7 +498,7 @@ __strcpy_small (char *__dest, __STRING2_COPY_ARR7 __sca7; __STRING2_COPY_ARR8 __sca8; } *__u = (void *) __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__c = '\0'; @@ -565,7 +565,7 @@ __stpcpy_small (char *__dest, unsigned char __uc; char __c; } *__u = (void *) __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__uc = '\0'; @@ -662,7 +662,7 @@ __stpcpy_small (char *__dest, __STRING2_COPY_ARR7 __sca7; __STRING2_COPY_ARR8 __sca8; } *__u = (void *) __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__c = '\0'; |