diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-11 22:38:36 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-11 22:38:36 +0100 |
| commit | 35be4534c029148a89ccc41e8e465d793e7ed7c2 (patch) | |
| tree | 68ccb6a9ed34fd033ebcaa2dbf0e6415fea1cffa | |
| parent | b65c749ac5a8a990d53493e3b9677142b1b9e4ce (diff) | |
patch 7.4.969v7.4.969
Problem: Compiler warnings on Windowx x64 build.
Solution: Add type casts. (Mike Williams)
| -rw-r--r-- | src/option.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c index f8cb1ba7cd..3f98f47b85 100644 --- a/src/option.c +++ b/src/option.c @@ -3287,8 +3287,8 @@ set_init_1() if (opt_idx >= 0) { #if !defined(HAVE_AVAIL_MEM) && !defined(HAVE_TOTAL_MEM) - if ((long)options[opt_idx].def_val[VI_DEFAULT] > (long)n - || (long)options[opt_idx].def_val[VI_DEFAULT] == 0L) + if ((long)(long_i)options[opt_idx].def_val[VI_DEFAULT] > (long)n + || (long)(long_i)options[opt_idx].def_val[VI_DEFAULT] == 0L) #endif options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n; } diff --git a/src/version.c b/src/version.c index 40a877d433..62990fc66b 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 969, +/**/ 968, /**/ 967, |