diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-12 21:31:58 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-12 21:31:58 +0100 |
| commit | 977d03733601948ab334fec24d0da82bc18c57c3 (patch) | |
| tree | 69d97b16128161226378e35bd29bbf5e974c5675 | |
| parent | 025a6b708a9bff54c73fb9c641b980da19e943a9 (diff) | |
| download | vim-git-977d03733601948ab334fec24d0da82bc18c57c3.tar.gz | |
patch 8.0.0454: compiler warnings for "always true" comparisonv8.0.0454
Problem: Compiler warnings for comparing unsigned char with 256 always
being true. (Manuel Ortega)
Solution: Add type cast.
| -rw-r--r-- | src/charset.c | 4 | ||||
| -rw-r--r-- | src/screen.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/charset.c b/src/charset.c index 2091d233b..29c587b52 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1090,7 +1090,7 @@ win_lbr_chartabsize( */ if (wp->w_p_lbr && VIM_ISBREAK(c) - && !VIM_ISBREAK(s[1]) + && !VIM_ISBREAK((int)s[1]) && wp->w_p_wrap # ifdef FEAT_WINDOWS && wp->w_width != 0 @@ -1120,7 +1120,7 @@ win_lbr_chartabsize( if (!(c != NUL && (VIM_ISBREAK(c) || (!VIM_ISBREAK(c) - && (col2 == col || !VIM_ISBREAK(*ps)))))) + && (col2 == col || !VIM_ISBREAK((int)*ps)))))) break; col2 += win_chartabsize(wp, s, col2); diff --git a/src/screen.c b/src/screen.c index b4fff18d9..206b50fc0 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4554,7 +4554,7 @@ win_line( * Found last space before word: check for line break. */ if (wp->w_p_lbr && c0 == c - && VIM_ISBREAK(c) && !VIM_ISBREAK(*ptr)) + && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) { # ifdef FEAT_MBYTE int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; diff --git a/src/version.c b/src/version.c index 28c929429..2f9c3150d 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 454, +/**/ 453, /**/ 452, |