diff options
| author | Bram Moolenaar <bram@vim.org> | 2012-06-07 21:09:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2012-06-07 21:09:39 +0200 |
| commit | 0716f1741cffe440416b82e7e4f9064facc13482 (patch) | |
| tree | da7b7c6a5bdac5b887dd759bb42e1947c8ceba63 | |
| parent | e91788670fa2114ea019e90dd16be9370fab9f65 (diff) | |
| download | vim-0716f1741cffe440416b82e7e4f9064facc13482.tar.gz | |
Problem: Compiler warning on 64 bit Windows.
Solution: Add type cast. (Mike Williams)
| -rw-r--r-- | src/ops.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -4352,7 +4352,7 @@ do_join(count, insert_space, save_undo, use_formatoptions) char_u *new_curr = skip_comment(curr, TRUE, insert_space, &prev_was_comment); - comments[t] = new_curr - curr; + comments[t] = (int)(new_curr - curr); curr = new_curr; } else diff --git a/src/version.c b/src/version.c index d07a09cd..e9f16079 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 */ /**/ + 548, +/**/ 547, /**/ 546, |