diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-06-14 20:59:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-06-14 20:59:25 +0200 |
| commit | 36105782d2dfe526a0ca361d1c6c06e6f7a9ca6f (patch) | |
| tree | c9a43a99ab24de7817db4560f30d0fdcb3b82a4b | |
| parent | 77c193579b39bbeacd4ffa4a16b5f3cd00c39cee (diff) | |
| download | vim-git-36105782d2dfe526a0ca361d1c6c06e6f7a9ca6f.tar.gz | |
updated for version 7.3.556v7.3.556
Problem: Compiler warnings on 64 bit Windows.
Solution: Add type casts. (Mike Williams)
| -rw-r--r-- | src/misc1.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/misc1.c b/src/misc1.c index 8029a1f54..1519e97b3 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -445,8 +445,7 @@ get_number_indent(lnum) if (vim_regexec(®match, ml_get(lnum) + lead_len, (colnr_T)0)) { pos.lnum = lnum; - pos.col = *regmatch.endp - (ml_get(lnum) + lead_len); - pos.col += lead_len; + pos.col = (colnr_T)(*regmatch.endp - ml_get(lnum)); #ifdef FEAT_VIRTUALEDIT pos.coladd = 0; #endif @@ -1354,7 +1353,8 @@ open_line(dir, flags, second_line_indent) if (flags & OPENLINE_COM_LIST && second_line_indent > 0) { int i; - int padding = second_line_indent - (newindent + STRLEN(leader)); + int padding = second_line_indent + - (newindent + (int)STRLEN(leader)); /* Here whitespace is inserted after the comment char. * Below, set_indent(newindent, SIN_INSERT) will insert the diff --git a/src/version.c b/src/version.c index d3bb184ff..9dcb811be 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 556, +/**/ 555, /**/ 554, |