Mercurial > hg > xemacs-beta
diff src/font-lock.c @ 647:b39c14581166
[xemacs-hg @ 2001-08-13 04:45:47 by ben]
removal of unsigned, size_t, etc.
| author | ben |
|---|---|
| date | Mon, 13 Aug 2001 04:46:48 +0000 |
| parents | 183866b06e0b |
| children | fdefd0186b75 |
line wrap: on
line diff
--- a/src/font-lock.c Wed Aug 08 12:15:04 2001 +0000 +++ b/src/font-lock.c Mon Aug 13 04:46:48 2001 +0000 @@ -391,26 +391,32 @@ } } +/* You'd think it wouldn't be necessary to cast something to the type + it's already defined is, but if you're GCC, you apparently think + differently */ #define SYNTAX_START_STYLE(c1, c2) \ + ((enum comment_style) \ (SYNTAX_CODES_MATCH_START_P (c1, c2, SYNTAX_COMMENT_STYLE_A) ? \ comment_style_a : \ SYNTAX_CODES_MATCH_START_P (c1, c2, SYNTAX_COMMENT_STYLE_B) ? \ comment_style_b : \ - comment_style_none) + comment_style_none)) #define SYNTAX_END_STYLE(c1, c2) \ - (SYNTAX_CODES_MATCH_END_P (c1, c2, SYNTAX_COMMENT_STYLE_A) ? \ + ((enum comment_style) \ + (SYNTAX_CODES_MATCH_END_P (c1, c2, SYNTAX_COMMENT_STYLE_A) ? \ comment_style_a : \ SYNTAX_CODES_MATCH_END_P (c1, c2, SYNTAX_COMMENT_STYLE_B) ? \ comment_style_b : \ - comment_style_none) + comment_style_none)) #define SINGLE_SYNTAX_STYLE(c) \ - (SYNTAX_CODE_MATCHES_1CHAR_P (c, SYNTAX_COMMENT_STYLE_A) ? \ + ((enum comment_style) \ + (SYNTAX_CODE_MATCHES_1CHAR_P (c, SYNTAX_COMMENT_STYLE_A) ? \ comment_style_a : \ SYNTAX_CODE_MATCHES_1CHAR_P (c, SYNTAX_COMMENT_STYLE_B) ? \ comment_style_b : \ - comment_style_none) + comment_style_none)) /* Set up context_cache for position PT in BUF. */ @@ -615,8 +621,10 @@ } else if ((SYNTAX_CODE_COMMENT_BITS (syncode) & SYNTAX_SECOND_CHAR_END) && - context_cache.context == context_block_comment && - context_cache.ccontext == ccontext_end1 && + context_cache.context == + (enum syntactic_context) context_block_comment && + context_cache.ccontext == + (enum block_comment_context) ccontext_end1 && SYNTAX_CODES_END_P (prev_syncode, syncode) && /* the two chars match */ context_cache.style ==