summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/misc2.c3
-rw-r--r--src/termlib.c2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/misc2.c b/src/misc2.c
index c1519ef91..48acde8b6 100644
--- 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 9488a320e..59eab7d97 100644
--- 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 45faff9a6..86b0f5c37 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1462,
+/**/
1461,
/**/
1460,