Mercurial > hg > xemacs-beta
changeset 3544:981a144e71fa
[xemacs-hg @ 2006-08-05 08:30:35 by aidan]
Eliminate some Windows build errors that also happen with gcc -pedantic.
| author | aidan |
|---|---|
| date | Sat, 05 Aug 2006 08:30:36 +0000 |
| parents | c136144fe765 |
| children | 2ba8b7a25429 |
| files | src/ChangeLog src/syntax.c |
| diffstat | 2 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Aug 04 22:55:19 2006 +0000 +++ b/src/ChangeLog Sat Aug 05 08:30:36 2006 +0000 @@ -1,3 +1,9 @@ +2006-08-05 Aidan Kehoe <kehoea@parhasard.net> + + * syntax.c (complex_vars_of_syntax): + String literals are char[], not unsigned char[]. Cast them when + passing to a function that takes UExtbyte *. + 2006-08-05 Aidan Kehoe <kehoea@parhasard.net> * lread.c (read_unicode_escape):
--- a/src/syntax.c Fri Aug 04 22:55:19 2006 +0000 +++ b/src/syntax.c Sat Aug 05 08:30:36 2006 +0000 @@ -2490,18 +2490,20 @@ /* Control 0; treat as punctuation */ SET_RANGE_SYNTAX(0, 32, Spunct); - /* The whitespace--overwriting some of the above changes. */ - define_standard_syntax(" \t\015\014", Swhitespace); + /* The whitespace--overwriting some of the above changes. + + String literals are const char *s, not const unsigned char *s. */ + define_standard_syntax((const UExtbyte *)" \t\015\014", Swhitespace); /* DEL plus Control 1 */ SET_RANGE_SYNTAX(127, 159, Spunct); - define_standard_syntax ("\"", Sstring); - define_standard_syntax ("\\", Sescape); - define_standard_syntax ("_-+*/&|<>=", Ssymbol); - define_standard_syntax (".,;:?!#@~^'`", Spunct); + define_standard_syntax ((const UExtbyte *)"\"", Sstring); + define_standard_syntax ((const UExtbyte *)"\\", Sescape); + define_standard_syntax ((const UExtbyte *)"_-+*/&|<>=", Ssymbol); + define_standard_syntax ((const UExtbyte *)".,;:?!#@~^'`", Spunct); - for (p = "()[]{}"; *p; p+=2) + for (p = (const UExtbyte *)"()[]{}"; *p; p+=2) { Fput_char_table (make_char (p[0]), Fcons (make_int (Sopen), make_char (p[1])), @@ -2517,11 +2519,11 @@ /* The guillemets. These are not parentheses, in contrast to what the old code did. */ - define_standard_syntax("\253\273", Sstring); + define_standard_syntax((const UExtbyte *)"\253\273", Sstring); /* The inverted exclamation mark, and the multiplication and division signs. */ - define_standard_syntax("\241\327\367", Spunct); + define_standard_syntax((const UExtbyte *)"\241\327\367", Spunct); #undef SET_RANGE_SYNTAX }