summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-27 21:22:19 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-27 21:22:19 +0100
commit3a118be1501549a7a9b8f52618fd0a967470d0a1 (patch)
tree8c3543f10c16d74014c29394308eda8c842e7af2
parent16038d50c4309e8dee33c70ca2c9e7f73439c4df (diff)
patch 8.0.0246: compiler warnings for int to pointer conversionv8.0.0246
Problem: Compiler warnings for int to pointer conversion. Solution: Fix macro for mch_memmove(). (John Marriott)
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index a2ebcf51c5..d3c25e6943 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 */
/**/
+ 246,
+/**/
245,
/**/
244,
diff --git a/src/vim.h b/src/vim.h
index 1bd38219a3..abee386cb3 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1715,7 +1715,7 @@ typedef unsigned short disptick_T; /* display tick type */
typedef void *vim_acl_T; /* dummy to pass an ACL to a function */
#ifndef mch_memmove
-# define mch_memmove(to, from, len) memmove((char*)(to), (char*)(from), (char*)(len))
+# define mch_memmove(to, from, len) memmove((char*)(to), (char*)(from), (size_t)(len))
#endif
/*