patch 7.4.969
Problem: Compiler warnings on Windowx x64 build.
Solution: Add type casts. (Mike Williams)
diff --git a/src/option.c b/src/option.c
index f8cb1ba..3f98f47 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3287,8 +3287,8 @@
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 40a877d..62990fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 969,
+/**/
968,
/**/
967,