summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-16 22:06:57 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-16 22:06:57 +0100
commit0c0d4eca4dd6252f22ec39f2d561a5e8a68e9a4e (patch)
tree1a04ce1b62c23c5c66a796739f6ec52d5b79e211
parentf2405ed2321da4a879fe0b0703af780fc0432c63 (diff)
patch 8.0.0469: compiler warnings on MS-Windowsv8.0.0469
Problem: Compiler warnings on MS-Windows. Solution: Add type casts. (Christian Brabandt)
-rw-r--r--src/fold.c8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/fold.c b/src/fold.c
index 9606b68190..3051739183 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -3137,9 +3137,11 @@ foldMoveRange(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest)
* order. We have to swap folds in the range [move_end, dest_index) with
* those in the range [move_start, move_end).
*/
- foldReverseOrder(gap, move_start, dest_index - 1);
- foldReverseOrder(gap, move_start, move_start + dest_index - move_end - 1);
- foldReverseOrder(gap, move_start + dest_index - move_end, dest_index - 1);
+ foldReverseOrder(gap, (linenr_T)move_start, (linenr_T)dest_index - 1);
+ foldReverseOrder(gap, (linenr_T)move_start,
+ (linenr_T)(move_start + dest_index - move_end - 1));
+ foldReverseOrder(gap, (linenr_T)(move_start + dest_index - move_end),
+ (linenr_T)(dest_index - 1));
}
#undef fold_end
#undef valid_fold
diff --git a/src/version.c b/src/version.c
index e235fb8d09..bc85006864 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 */
/**/
+ 469,
+/**/
468,
/**/
467,