patch 7.4.1462

Problem:    Two more rarily used functions with errors.
Solution:   Add proper argument types. (Dominique Pelle)

diff --git a/src/misc2.c b/src/misc2.c
index c1519ef915b3d4acacd439c2bdf171a4afa386c3..48acde8b6b8f8997a8c129b5d6acedd037e20182 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1729,13 +1729,14 @@ vim_memcmp(void *b1, void *b2, size_t len)
 }
 #endif
 
+/* skipped when generating prototypes, the prototype is in vim.h */
 #ifdef VIM_MEMMOVE
 /*
  * Version of memmove() that handles overlapping source and destination.
  * For systems that don't have a function that is guaranteed to do that (SYSV).
  */
     void
-mch_memmove(void *src_arg, *dst_arg, size_t len)
+mch_memmove(void *src_arg, void *dst_arg, size_t len)
 {
     /*
      * A void doesn't have a size, we use char pointers.

diff --git a/src/termlib.c b/src/termlib.c
index 9488a320e438075a5dc5eb9055d2dafc7aa84cb1..59eab7d97e1382027d5a664086f74ebcc8ddb956 100644 (file)
--- a/src/termlib.c
+++ b/src/termlib.c
@@ -140,7 +140,7 @@ tgetent(
 }
 
     static int
-getent(char *tbuf, *term, FILE *termcap, int buflen)
+getent(char *tbuf, char *term, FILE *termcap, int buflen)
 {
     char    *tptr;
     int            tlen = strlen(term);

diff --git a/src/version.c b/src/version.c
index 45faff9a61017b9154a40401789802c4216fbdc6..86b0f5c371198ec395f8dde86cefbe39b1601a83 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1462,
 /**/
     1461,
 /**/