diff --git a/src/version.c b/src/version.c
index a2ebcf51c..d3c25e694 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    246,
 /**/
     245,
 /**/
diff --git a/src/vim.h b/src/vim.h
index 1bd38219a..abee386cb 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
 
 /*