summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_unix.h4
-rw-r--r--src/term.c2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/os_unix.h b/src/os_unix.h
index d02520018..4a353388c 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -565,7 +565,9 @@ int mch_rename __ARGS((const char *src, const char *dest));
# endif
#endif
-#define HAVE_DUP /* have dup() */
+#ifndef HAVE_DUP
+# define HAVE_DUP /* have dup() */
+#endif
#define HAVE_ST_MODE /* have stat.st_mode */
/* We have three kinds of ACL support. */
diff --git a/src/term.c b/src/term.c
index 35a6af9ba..41974de41 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4185,7 +4185,7 @@ check_termcode(max_offset, buf, bufsize, buflen)
{
#ifdef FEAT_MBYTE
int col;
- int row_char;
+ int row_char = NUL;
#endif
j = 0;
extra = 0;
diff --git a/src/version.c b/src/version.c
index bf33f2d40..65c25fe52 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 216,
+/**/
215,
/**/
214,